绩效考核 通过

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

@@ -7,8 +7,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ItdmPassRunFlowPath {
-    @ApiModelProperty(value = "需要保存或者需要通过的当前运行中步骤id")
-    private String runFlowPathStep;
+    @ApiModelProperty(value = "运行流程id")
+    private String runFlowPath;
 
 
 

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

@@ -92,7 +92,9 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
 
     @Override
     public void pass1(ItdmPassRunFlowPath itdmRunFlowPathStep) {
-        ItdmRunFlowPathStep select = this.baseMapper.selectById(itdmRunFlowPathStep.getRunFlowPathStep());
+
+        ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(itdmRunFlowPathStep.getRunFlowPath());
+        ItdmRunFlowPathStep select = this.baseMapper.selectById(itdmRunFlowPath.getDqSetp());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         select.setFqUser(user.getUsername());
         this.baseMapper.updateById(select);
@@ -101,11 +103,6 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
                 .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());