移装告知编辑接口bug修改

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

@@ -694,6 +694,48 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     /**
+     * 待办编辑接口       【如果没有代办直接返回空，业务判断】   ---- 在用，误删
+     * 参数
+     * taskStatus
+     * taskStatusLabel 操作名称  1驳回 2通过 3重新提交
+     * flowStatusLabel  任务状态枚举code
+     * 流程实例id  instanceId
+     * flowCode 任务id
+
+     **/
+    public TaskV2Model updateTaskModelOld(Map<String, Object> params) {
+        String exeUserId = RequestContext.getExeUserId();
+        List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
+
+        // 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) {
+            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());
+        model.setRoutePath(model.getRoutePath().replace("roleIds", "role").replace("edit", "look"));
+        Systemctl.taskV2Client.update(model, model.getSequenceNbr());
+        //修改model并返回 用于组装新待办
+        model.setEndUserId(null);
+        model.setTaskStatus(null);
+        model.setEndDate(null);
+        model.setSequenceNbr(null);
+        model.setCreateDate(new Date());
+        model.setStartDate(new Date());
+        return model;
+    }
+
+
+    /**
      * 待办 撤回
      * @param id 工作流实例id
      * @param obj 自己的实体：taskType为BusinessTypeEnum code；nextExecuteUser

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/JgTransferNoticeServiceImpl.java

@@ -319,23 +319,23 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 map.put("relationId", notice.getInstanceId());
                 map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
                 map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
-                TaskV2Model taskV2Model = commonService.updateTaskModel(map);
-                TaskModelDto taskModelDto = new TaskModelDto();
-                taskV2Model.setRelationId(notice.getInstanceId());
-                taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskV2Model.setTaskType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
-                taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName());
-                BeanUtils.copyProperties(taskV2Model, taskModelDto);
-                // 创建新的代办
-                taskModelDto.setModel(notice);
-                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskModelDto.setFlowCode(notice.getNextTaskId());
-                taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                TaskV2Model taskV2Model = commonService.updateTaskModelOld(map);
+                if (ObjectUtils.isEmpty(taskV2Model)) {
+                    // 如果为保存并提交，则创建代办
+                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                } else {
+                    TaskModelDto taskModelDto = new TaskModelDto();
+                    BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                    // 创建新的代办
+                    taskModelDto.setModel(notice);
+                    taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                    taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                    taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    taskModelDto.setFlowCode(notice.getNextTaskId());
+                    taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                    commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                }
             }
         } else {
             JgTransferNotice bean = new JgTransferNotice();