Forráskód Böngészése

绩效考核 还没做完

ys321973351 1 éve%!(EXTRA string=óta)
szülő
commit
a3a1170ea6

+ 2 - 2
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/dto/ItdmSaveRunFlowPath.java

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

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

@@ -9,7 +9,6 @@ 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.ItdmRunFlowPath;
-import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathLog;
 import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathStep;
 import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathLogMapper;
 import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathMapper;
@@ -50,7 +49,7 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
     public void saveData(ItdmSaveRunFlowPath saveRunFlowPath) {
 
         ItdmRunFlowPathStep itdmRunFlowPathStep = new ItdmRunFlowPathStep();
-        itdmRunFlowPathStep.setId(saveRunFlowPath.getId());
+        itdmRunFlowPathStep.setId(saveRunFlowPath.getRunFlowPathStep());
         itdmRunFlowPathStep.setSaveData(saveRunFlowPath.getSaveData());
 
         this.baseMapper.updateById(itdmRunFlowPathStep);
@@ -61,7 +60,7 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
     @Transactional
     public void pass(ItdmSaveRunFlowPath saveRunFlowPath) {
 
-        ItdmRunFlowPathStep select = this.baseMapper.selectById(saveRunFlowPath.getId());
+        ItdmRunFlowPathStep select = this.baseMapper.selectById(saveRunFlowPath.getRunFlowPathStep());
         select.setSaveData(saveRunFlowPath.getSaveData());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         select.setFqUser(user.getUsername());