修改待办驳回逻辑

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

@@ -615,6 +615,7 @@ public class CommonServiceImpl implements ICommonService {
     public void buildTaskModel(List<TaskModelDto> list) {
         list.forEach(obj -> {
             TaskV2Model model = new TaskV2Model();
+            BeanUtil.copyProperties(obj, model);
             String urlParams = "";
             try {
                 urlParams = "&" + toQueryParams(obj.getModel());
@@ -627,14 +628,14 @@ public class CommonServiceImpl implements ICommonService {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()).replace("{userId}", RequestContext.getExeUserId()) + urlParams);
                 }
             }
+            model.setFlowStatus(obj.getTaskStatus());
+            model.setFlowCode(obj.getTaskStatusLabel());
             model.setRoutePath(obj.getRoutePath() + urlParams);
-            BeanUtil.copyProperties(obj, model);
-            model.setFlowStatus(0);
+            model.setTaskType("0");
             model.setFlowInstanceId(model.getRelationId());
             model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
             model.setTaskSource("workFlow");
             model.setExtras(JSON.toJSONString(obj.getModel()));
-            // model.setTerminal(params.getOrDefault("terminal","WEB").toString());
             model.setCreateDate(new Date());
             model.setRecUserId(RequestContext.getExeUserId());
             model.setAgencyCode(RequestContext.getAgencyCode());
@@ -686,12 +687,14 @@ public class CommonServiceImpl implements ICommonService {
         List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
         TaskV2Model model = list.get(0);
         Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
-        TaskV2Model lastTaskModel = list.get(1);
-        lastTaskModel.setEndUserId(null);
-        lastTaskModel.setEndDate(null);
-        lastTaskModel.setFlowStatus(0);
-        lastTaskModel.setRoutePath(model.getRoutePath().replace("role", "roleIds").replace("look", "edit"));
-        Systemctl.taskV2Client.update(lastTaskModel, lastTaskModel.getSequenceNbr());
+        if (list.size()>1){
+            TaskV2Model lastTaskModel = list.get(1);
+            lastTaskModel.setEndUserId(null);
+            lastTaskModel.setEndDate(null);
+            lastTaskModel.setFlowStatus(0);
+            lastTaskModel.setRoutePath(model.getRoutePath().replace("role", "roleIds").replace("look", "edit"));
+            Systemctl.taskV2Client.update(lastTaskModel, lastTaskModel.getSequenceNbr());
+        }
     }
 
     public <T> String toQueryParams(T obj) throws UnsupportedEncodingException {