更新待办按钮

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -667,37 +667,51 @@ public class CommonServiceImpl implements ICommonService {
         // TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
         //         .findFirst()
         //         .orElse(null);
-        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
-                .findFirst()
-                .orElse(null);
-        if (model == null) {
+        List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+
+        if (collect == null || collect.size() == 0) {
             return null;
         }
 
-        model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
-        model.setFlowStatusLabel(params.get("flowStatusLabel").toString());
-        model.setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
-        model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
-        model.setEndUserId(exeUserId);
-        model.setEndDate(new Date());
+
+        collect.get(0).setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
+        collect.get(0).setFlowStatusLabel(params.get("flowStatusLabel").toString());
+        collect.get(0).setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
+        collect.get(0).setTaskStatusLabel(params.get("taskStatusLabel").toString());
+        collect.get(0).setEndUserId(exeUserId);
+        collect.get(0).setEndDate(new Date());
 
 //        String[] roleIds = model.getRoutePath().split("roleIds=");
 //        String[] userIds = roleIds[1].split("&userId");
 //        String url = roleIds[0]+"roleIds="+"55555"+"&userId"+ userIds[1];
 //        String tarUrl = url.replaceFirst("&executeUserIds=", "");
 //        tarUrl+"&executeUserIds="
-
        // model.setRoutePath( roleIds[0]+"roleIds="+"55555"+"&userId"+userIds[1]);
-        model.setRoutePath(model.getRoutePath().replace("roleIds=","roleIds=55555&fq="));
-        Systemctl.taskV2Client.update(model, model.getSequenceNbr());
+        collect.get(0).setRoutePath(collect.get(0).getRoutePath().replace("roleIds=","roleIds=55555&fq="));
+        //当流程完成时将所有待办状态统一修改为已完成
+        if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
+            for (TaskV2Model taskV2Model : result) {
+                taskV2Model.setTaskStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
+                taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
+                taskV2Model.setFlowStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
+            }
+            Systemctl.taskV2Client.batchUpdate(collect);
+        }else {
+            Systemctl.taskV2Client.update(collect.get(0), collect.get(0).getSequenceNbr());
+        }
+
+
+
+
         //修改model并返回 用于组装新待办
-        model.setEndUserId(null);
-        model.setTaskStatus(null);
-        model.setEndDate(null);
-        model.setSequenceNbr(null);
-        model.setCreateDate(new Date());
-        model.setStartDate(new Date());
-        return model;
+        collect.get(0).setEndUserId(null);
+        collect.get(0).setTaskStatus(null);
+        collect.get(0).setEndDate(null);
+        collect.get(0).setSequenceNbr(null);
+        collect.get(0).setCreateDate(new Date());
+        collect.get(0).setStartDate(new Date());
+        return collect.get(0);
     }
 
     /**
@@ -717,33 +731,52 @@ public class CommonServiceImpl implements ICommonService {
         // TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
         //         .findFirst()
         //         .orElse(null);
-        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
-                .findFirst()
-                .orElse(null);
-        if (model != null) {
-            model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
-            model.setFlowStatusLabel(params.get("flowStatusLabel").toString());
-            model.setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
-            model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
-            model.setEndUserId(exeUserId);
-            model.setEndDate(new Date());
-            model.setRoutePath(model.getRoutePath().replace("roleIds=","roleIds=55555&fq="));
-            Systemctl.taskV2Client.update(model, model.getSequenceNbr());
-        } else {
-            model = new TaskV2Model();
+        List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+
+        if (null  ==collect  || collect.size() == 0) {
+            TaskV2Model    model = new TaskV2Model();
             model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
             model.setFlowStatusLabel(params.get("flowStatusLabel").toString());
             model.setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
             model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
+            return model;
         }
+
+
+        collect.get(0).setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
+        collect.get(0).setFlowStatusLabel(params.get("flowStatusLabel").toString());
+        collect.get(0).setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
+        collect.get(0).setTaskStatusLabel(params.get("taskStatusLabel").toString());
+        collect.get(0).setEndUserId(exeUserId);
+        collect.get(0).setEndDate(new Date());
+
+//        String[] roleIds = model.getRoutePath().split("roleIds=");
+//        String[] userIds = roleIds[1].split("&userId");
+//        String url = roleIds[0]+"roleIds="+"55555"+"&userId"+ userIds[1];
+//        String tarUrl = url.replaceFirst("&executeUserIds=", "");
+//        tarUrl+"&executeUserIds="
+        // model.setRoutePath( roleIds[0]+"roleIds="+"55555"+"&userId"+userIds[1]);
+        collect.get(0).setRoutePath(collect.get(0).getRoutePath().replace("roleIds=","roleIds=55555&fq="));
+        //当流程完成时将所有待办状态统一修改为已完成
+        if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
+            for (TaskV2Model taskV2Model : result) {
+                taskV2Model.setTaskStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
+                taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
+                taskV2Model.setFlowStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
+            }
+            Systemctl.taskV2Client.batchUpdate(collect);
+        }else {
+            Systemctl.taskV2Client.update(collect.get(0), collect.get(0).getSequenceNbr());
             //修改model并返回 用于组装新待办
-        model.setEndUserId(null);
-        model.setTaskStatus(null);
-        model.setEndDate(null);
-        model.setSequenceNbr(null);
-        model.setCreateDate(new Date());
-        model.setStartDate(new Date());
-        return model;
+        }
+        collect.get(0).setEndUserId(null);
+        collect.get(0).setTaskStatus(null);
+        collect.get(0).setEndDate(null);
+        collect.get(0).setSequenceNbr(null);
+        collect.get(0).setCreateDate(new Date());
+        collect.get(0).setStartDate(new Date());
+        return collect.get(0);
     }