移装告知和安装告知 暂存和驳回待办处理

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

@@ -254,7 +254,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 this.updateById(notice);
                 // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
             } else {
                 ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
                 WorkflowResultDto workflowResultDto = new WorkflowResultDto();
@@ -296,7 +296,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map);
                 if (ObjectUtils.isEmpty(taskV2Model)) {
                     // 如果为保存并提交，则创建代办
-                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
                 } else {
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
@@ -503,7 +503,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         jgInstallationNoticeMapper.insertBatchSomeColumn(list);
         // 如果为保存并提交，则创建代办
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            buildTask(list, workflowResultList);
+            buildTask(list, workflowResultList, Boolean.TRUE);
+        } else {
+            // 暂存任务
+            buildTaskDraft(list);
         }
 
         List<JgInstallationNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
@@ -514,7 +517,32 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
     }
 
-    private void buildTask(List<JgInstallationNotice> list, List<WorkflowResultDto> workflowResultList) {
+    /**
+     * 暂存任务生成待办
+     * @param list 业务信息
+     */
+    private void buildTaskDraft(List<JgInstallationNotice> list) {
+        List<TaskModelDto> modelDtos = new ArrayList<>();
+        list.forEach(obj -> {
+            TaskModelDto dto = new TaskModelDto();
+            //行数据
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(obj, taskMessageDto);
+            dto.setModel(taskMessageDto);
+            //摘要 按原有规则组装
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getFactoryNum()) ? "" : obj.getFactoryNum(), obj.getApplyNo()));
+            //申请单号
+            dto.setTaskCode(obj.getApplyNo());
+            //业务类型枚举code值
+            dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
+            ////业务主键
+            dto.setRelationId(obj.getSequenceNbr() + "");
+            modelDtos.add(dto);
+        });
+        commonService.buildTaskModel(modelDtos);
+    }
+
+    private void buildTask(List<JgInstallationNotice> list, List<WorkflowResultDto> workflowResultList, Boolean isDeleteDraft) {
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
         WorkflowResultDto workflowResultDto = workflowResultList.get(0);
         list.forEach(item -> {
@@ -540,6 +568,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
+            if (isDeleteDraft) {
+                // 删除暂存时生成的待办
+                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+            }
         });
         commonService.buildTaskModel(taskModelDtoList);
     }
@@ -864,6 +896,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            taskModelDto.setPageType("edit");
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());

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

@@ -285,7 +285,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 jgTransferNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
             } else {
                 ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
                 WorkflowResultDto workflowResultDto = new WorkflowResultDto();
@@ -326,7 +326,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map);
                 if (ObjectUtils.isEmpty(taskV2Model)) {
                     // 如果为保存并提交，则创建代办
-                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
                 } else {
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
@@ -403,7 +403,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jgTransferNoticeMapper.insertBatchSomeColumn(list);
         // 如果为保存并提交，则创建代办
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            buildTask(list, workflowResultList);
+            buildTask(list, workflowResultList, Boolean.TRUE);
+        } else {
+            // 暂存任务
+            buildTaskDraft(list);
         }
         List<JgTransferNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
             List<JgTransferNotice> collect = list.stream().filter(JgTransferNotice -> jgRelationEquip.getEquipTransferId().equals(JgTransferNotice.getApplyNo())).collect(Collectors.toList());
@@ -415,6 +418,31 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
     /**
+     * 暂存任务生成待办
+     * @param list 业务信息
+     */
+    private void buildTaskDraft(List<JgTransferNotice> list) {
+        List<TaskModelDto> modelDtos = new ArrayList<>();
+        list.forEach(obj -> {
+            TaskModelDto dto = new TaskModelDto();
+            //行数据
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(obj, taskMessageDto);
+            dto.setModel(taskMessageDto);
+            //摘要 按原有规则组装
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), obj.getSupervisoryCode(), obj.getApplyNo()));
+            //申请单号
+            dto.setTaskCode(obj.getApplyNo());
+            //业务类型枚举code值
+            dto.setTaskType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
+            ////业务主键
+            dto.setRelationId(obj.getSequenceNbr() + "");
+            modelDtos.add(dto);
+        });
+        commonService.buildTaskModel(modelDtos);
+    }
+
+    /**
      * 组装业务数据
      */
     private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model, List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel, List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list, List<JgTransferNoticeEq> equipList) {
@@ -457,7 +485,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     /**
      * 插入代办
      */
-    private void buildTask(List<JgTransferNotice> list, List<WorkflowResultDto> workflowResultList) {
+    private void buildTask(List<JgTransferNotice> list, List<WorkflowResultDto> workflowResultList, Boolean isDeleteDraft) {
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
         WorkflowResultDto workflowResultDto = workflowResultList.get(0);
         list.forEach(item -> {
@@ -483,12 +511,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
+            if (isDeleteDraft) {
+                // 删除暂存时生成的待办
+                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+            }
         });
         commonService.buildTaskModel(taskModelDtoList);
     }
 
     /**
      * 工作流启动并执行
+     *
      * @param submitType 是否提交
      * @param deviceList 设备信息
      * @return 工作流返回相关数据
@@ -698,6 +731,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            taskModelDto.setPageType("edit");
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
@@ -710,6 +744,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 
     /**
      * 执行工作流并返回组装好的工作流信息
+     *
      * @param op               是否通过
      * @param opinion          备注信息
      * @param jgTransferNotice 业务信息