Browse Source

绩效考核 还没做完

ys321973351 1 year ago
parent
commit
e7bc85dca0

+ 3 - 4
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmRunFlowPathController.java

@@ -174,11 +174,12 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
                     new ArrayList<>();
             List<String> roleIds = sysBaseApi.getRoleIdsByUsername(user.getUsername());
             if (strings.contains(user.getUsername()) || roleIds.contains(i.getRoleId())) {
-                vos.add(FlowPathConvert.INSTANCE.to(i, true));
+                vos.add(FlowPathConvert.INSTANCE.to(i, true, i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp())));
             } else {
-                vos.add(FlowPathConvert.INSTANCE.to(i, false));
+                vos.add(FlowPathConvert.INSTANCE.to(i, false, i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp())));
             }
 
+
         }
 
         return Result.OK(new ItdmRunFlowPathInfoVO(itdmRunFlowPath, vos));
@@ -210,6 +211,4 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
     }
 
 
-
-
 }

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

@@ -30,7 +30,7 @@ public interface FlowPathConvert {
     ItdmRunFlowPathStep to(ItdmFlowPathStep step, String saveData, String runFlowPath);
 
 
-    ItdmRunFlowPathStepVO to(ItdmRunFlowPathStep step, Boolean isUpdate);
+    ItdmRunFlowPathStepVO to(ItdmRunFlowPathStep step, Boolean isUpdate, Boolean dangqian);
 
 
     ItdmBuohuiRunFlowPathStepVO to(ItdmRunFlowPathStep step);

+ 3 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/vo/ItdmRunFlowPathStepVO.java

@@ -35,4 +35,7 @@ public class ItdmRunFlowPathStepVO {
     private String saveData;
 
     private  Boolean isUpdate;
+
+
+    private Boolean dangqian;
 }