通过和驳回

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/convert/FlowPathConvert.java

@@ -43,6 +43,8 @@ public interface FlowPathConvert {
     ItdmRunFlowPathStepVO to(ItdmRunFlowPathStep step, Boolean isUpdate, Boolean dangqian, ItdmWeituoInfo itdmWeituoInfo);
 
 
+    @Mapping(target = "value", source = "id")
+    @Mapping(target = "text", source = "name")
 
     ItdmBuohuiRunFlowPathStepVO to(ItdmRunFlowPathStep step);
 }

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

@@ -42,6 +42,10 @@ public class ItdmFZRunFlowPathLogService {
 
 
         ItdmRunFlowPathStep dqSept = stepMapper.selectById(dqRunflowpathSept);
+
+
+
+
         ItdmRunFlowPathStep nextSept = stepMapper.selectById(nextstep);
 
         itdmRunFlowPathLog.setRunFlowPath(runFlowPath);

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

@@ -47,6 +47,8 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
     private ItdmFZRunFlowPathLogService logService;
 
     @Override
+    @Transactional
+
     public void saveData(ItdmSaveRunFlowPath saveRunFlowPath) {
         ItdmRunFlowPathStep select = this.baseMapper.selectById(saveRunFlowPath.getRunFlowPathStep());
         ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(select.getRunFlowPath());
@@ -91,6 +93,8 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
     }
 
     @Override
+    @Transactional
+
     public void pass1(ItdmPassRunFlowPath itdmRunFlowPathStep) {
 
         ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(itdmRunFlowPathStep.getRunFlowPath());
@@ -117,6 +121,7 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
     }
 
     @Override
+    @Transactional
     public void rejectDQ(ItdmRejectDQRunFlowPath itdmRejectDQRunFlowPath) {
         ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(itdmRejectDQRunFlowPath.getRunFlowPath());
         ItdmRunFlowPathStep select = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
@@ -161,14 +166,24 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
 
 
     @Override
+    @Transactional
+
     public void rejectzd(ItdmRejectZDRunFlowPath zdRunFlowPath) {
+
         ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(zdRunFlowPath.getRunFlowPath());
         ItdmRunFlowPathStep prvestep = this.baseMapper.selectById(zdRunFlowPath.getRunFlowPathSept());
+
+        ItdmRunFlowPathStep select = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                .eq(ItdmRunFlowPathStep::getRunFlowPath, itdmRunFlowPath.getId())
+                .eq(ItdmRunFlowPathStep::getFlowPathSetp, itdmRunFlowPath.getDqSetp())
+
+        );
+
         itdmRunFlowPath.setDqSetp(prvestep.getFlowPathSetp());
         itdmRunFlowPath.setDqSetpUserIds(prvestep.getUserIds());
         itdmRunFlowPath.setDqSetpRoleId(prvestep.getRoleId());
         itdmRunFlowPathMapper.updateById(itdmRunFlowPath);
-        logService.insert(prvestep.getRunFlowPath(), itdmRunFlowPath.getDqSetp(), prvestep.getId(), "驳回指定节点", zdRunFlowPath.getYuanyin());
+        logService.insert(prvestep.getRunFlowPath(), select.getId(), prvestep.getId(), "驳回指定节点", zdRunFlowPath.getYuanyin());
 
 
     }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/vo/ItdmBuohuiRunFlowPathStepVO.java

@@ -12,8 +12,8 @@ public class ItdmBuohuiRunFlowPathStepVO {
     /**主键*/
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private String value;
 
-    private String name;
+    private String text;
 
 }