Merge branch 'develop_tzs_register' of…

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

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
@@ -300,13 +301,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     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());
+                    TaskMessageDto taskMessageDto = new TaskMessageDto();
+                    BeanUtils.copyProperties(notice, taskMessageDto);
+                    taskModelDto.setModel(taskMessageDto);
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
             }
@@ -531,9 +534,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
-            taskModelDto.setModel(item);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
             taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getFactoryNum()) ? "" : item.getFactoryNum(), item.getApplyNo()));
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(item, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -807,8 +812,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 taskMap.put("relationId", jgInstallationNotice.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                taskMap.put("model", jgInstallationNotice);
+
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+                taskMap.put("model", taskMessageDto);
                 taskV2Model = commonService.updateTaskModel(taskMap);
+
             } else {
                 jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgInstallationNotice.getInstanceStatus())) {
@@ -828,7 +837,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgInstallationNotice);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -836,6 +844,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+                taskModelDto.setModel(taskMessageDto);
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
             }
         } else {
@@ -852,13 +863,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
             // 创建新的代办
-            taskModelDto.setModel(jgInstallationNotice);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
@@ -330,13 +331,15 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     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());
+                    TaskMessageDto taskMessageDto = new TaskMessageDto();
+                    BeanUtils.copyProperties(notice, taskMessageDto);
+                    taskModelDto.setModel(taskMessageDto);
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
             }
@@ -474,9 +477,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
-            taskModelDto.setModel(item);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
             taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(item, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -638,7 +643,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                taskMap.put("model", jgTransferNotice);
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
+                taskMap.put("model", taskMessageDto);
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
@@ -659,7 +666,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgTransferNotice);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -667,6 +673,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
+                taskModelDto.setModel(taskMessageDto);
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
             }
         } else {
@@ -683,13 +692,15 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
             // 创建新的代办
-            taskModelDto.setModel(jgTransferNotice);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
         jgTransferNotice.setNextTaskId(workflowResultDto.getNextTaskId());