绩效考核 还没做完

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

@@ -18,16 +18,15 @@ public interface FlowPathConvert {
 
     FlowPathConvert INSTANCE = Mappers.getMapper(FlowPathConvert.class);
 
-    @Mapping(target = "flowPath",source = "step.flowPathId")
-    @Mapping(target = "flowPathSetp",source = "step.id")
-    @Mapping(target = "name",source = "step.name")
-    @Mapping(target = "sort",source = "step.sort")
-    @Mapping(target = "saveData",source = "saveData")
+    @Mapping(target = "flowPath", source = "step.flowPathId")
+    @Mapping(target = "flowPathSetp", source = "step.id")
+    @Mapping(target = "name", source = "step.name")
+    @Mapping(target = "sort", source = "step.sort")
+    @Mapping(target = "saveData", source = "saveData")
     @Mapping(target = "id", ignore = true)
-    @Mapping(target = "userIds",source = "step.userIds")
-    @Mapping(target = "roleId",source = "step.roleId")
-
-    ItdmRunFlowPathStep to(ItdmFlowPathStep step,String saveData);
+    @Mapping(target = "userIds", source = "step.userIds")
+    @Mapping(target = "roleId", source = "step.roleId")
+    ItdmRunFlowPathStep to(ItdmFlowPathStep step, String saveData, String runFlowPath);
 
 
     ItdmRunFlowPathStepVO to(ItdmRunFlowPathStep step, Boolean isUpdate);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/entity/ItdmRunFlowPathStep.java

@@ -40,6 +40,10 @@ public class ItdmRunFlowPathStep implements Serializable {
 	@Excel(name = "流程id", width = 15)
     @ApiModelProperty(value = "流程id")
     private String flowPath;
+
+    @Excel(name = "运行流程id", width = 15)
+    @ApiModelProperty(value = "运行流程id")
+    private java.lang.String runFlowPath;
 	/**流程步骤id*/
 	@Excel(name = "流程步骤id", width = 15)
     @ApiModelProperty(value = "流程步骤id")

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

@@ -82,7 +82,8 @@ public class ItdmRunFlowPathServiceImpl extends ServiceImpl<ItdmRunFlowPathMappe
 
         for (int i = 0; i < list.size(); i++) {
             ItdmFlowPathStep itdmFlowPathStep = list.get(i);
-            ItdmRunFlowPathStep itdmRunFlowPathStep = FlowPathConvert.INSTANCE.to(itdmFlowPathStep, null);
+            // todo
+            ItdmRunFlowPathStep itdmRunFlowPathStep = FlowPathConvert.INSTANCE.to(itdmFlowPathStep, null,itdmRunFlowPath.getId());
             itdmRunFlowPathStepMapper.insert(itdmRunFlowPathStep);
         }