绩效考核 通过

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmRunFlowPathStepController.java

@@ -14,6 +14,7 @@ import lombok.Getter;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.flowpath.dto.ItdmPassRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmRejectDQRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmRejectZDRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmSaveRunFlowPath;
@@ -119,6 +120,24 @@ public class ItdmRunFlowPathStepController extends JeecgController<ItdmRunFlowPa
 	  * @param itdmRunFlowPathStep
 	  * @return
 	  */
+	 @AutoLog(value = "运行流程步骤表-通过")
+	 @ApiOperation(value="运行流程步骤表-通过", notes="运行流程步骤表-通过")
+	 //@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:edit")
+	 @PostMapping(value = "/pass")
+	 public Result<String> pass1(@RequestBody ItdmPassRunFlowPath itdmRunFlowPathStep) {
+		 itdmRunFlowPathStepService.pass1(itdmRunFlowPathStep);
+		 return Result.OK("编辑成功!");
+	 }
+
+
+
+
+	 /**
+	  *  编辑
+	  *
+	  * @param itdmRunFlowPathStep
+	  * @return
+	  */
 	 @AutoLog(value = "运行流程步骤表-驳回到上一节点")
 	 @ApiOperation(value="运行流程步骤表-驳回到上一节点", notes="运行流程步骤表-驳回到上一节点")
 	 //@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:edit")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/dto/ItdmPassRunFlowPath.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.flowpath.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ItdmPassRunFlowPath {
+    @ApiModelProperty(value = "需要保存或者需要通过的当前运行中步骤id")
+    private String runFlowPathStep;
+
+
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/IItdmRunFlowPathStepService.java

@@ -1,19 +1,21 @@
 package org.jeecg.modules.flowpath.service;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.flowpath.dto.ItdmPassRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmRejectDQRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmRejectZDRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmSaveRunFlowPath;
 import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathStep;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.flowpath.vo.ItdmBuohuiRunFlowPathStepVO;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
 /**
  * @Description: 运行流程步骤表
  * @Author: jeecg-boot
- * @Date:   2023-07-20
+ * @Date: 2023-07-20
  * @Version: V1.0
  */
 public interface IItdmRunFlowPathStepService extends IService<ItdmRunFlowPathStep> {
@@ -24,6 +26,9 @@ public interface IItdmRunFlowPathStepService extends IService<ItdmRunFlowPathSte
 
     void pass(ItdmSaveRunFlowPath saveRunFlowPath);
 
+    void pass1(ItdmPassRunFlowPath itdmRunFlowPathStep);
+
+
     void rejectDQ(ItdmRejectDQRunFlowPath itdmRejectDQRunFlowPath);
 
     void rejectzd(ItdmRejectZDRunFlowPath zdRunFlowPath);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/impl/ItdmRunFlowPathStepServiceImpl.java

@@ -5,6 +5,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.flowpath.convert.FlowPathConvert;
+import org.jeecg.modules.flowpath.dto.ItdmPassRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmRejectDQRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmRejectZDRunFlowPath;
 import org.jeecg.modules.flowpath.dto.ItdmSaveRunFlowPath;
@@ -89,6 +90,30 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
 
     }
 
+    @Override
+    public void pass1(ItdmPassRunFlowPath itdmRunFlowPathStep) {
+        ItdmRunFlowPathStep select = this.baseMapper.selectById(itdmRunFlowPathStep.getRunFlowPathStep());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        select.setFqUser(user.getUsername());
+        this.baseMapper.updateById(select);
+        ItdmRunFlowPathStep nextstep = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                .eq(ItdmRunFlowPathStep::getRunFlowPath, select.getRunFlowPath())
+                .eq(ItdmRunFlowPathStep::getSort, Integer.parseInt(select.getSort()) + 1)
+
+        );
+        ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(select.getRunFlowPath());
+        if (!itdmRunFlowPath.getDqSetp().equals(select.getFlowPathSetp())) {
+            throw new JeecgBootException("当前节点不是在进行中");
+        }
+
+        itdmRunFlowPath.setId(select.getRunFlowPath());
+        itdmRunFlowPath.setDqSetp(nextstep.getFlowPathSetp());
+        itdmRunFlowPath.setDqSetpUserIds(nextstep.getUserIds());
+        itdmRunFlowPath.setDqSetpRoleId(nextstep.getRoleId());
+        itdmRunFlowPathMapper.updateById(itdmRunFlowPath);
+
+        logService.insert(select.getRunFlowPath(), select.getId(), nextstep.getId(), "通过", "");
+    }
 
     @Override
     public void rejectDQ(ItdmRejectDQRunFlowPath itdmRejectDQRunFlowPath) {