fix(JG)：改造告知,设备移交代码提交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TaskMessageDto.java

@@ -44,6 +44,10 @@ public class TaskMessageDto {
      * 登记 告知状态
      */
     String auditStatus;
+    /**
+     * 设备移交
+     */
+    String applyStatus;
 
     /**
      * 流程创建（发起）人

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

@@ -161,7 +161,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
      * @return 代办信息
      */
     private TaskModelDto buildTaskModelDto(JgEquipTransfer item, WorkflowResultDto workflowResultDto) {
-        item.setInstanceId(workflowResultDto.getInstanceId());
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtil.copyProperties(item, taskMessageDto);
         return TaskModelDto.builder()
                 .flowCreateDate(item.getCreateDate())
                 .taskName(workflowResultDto.getNextTaskName())
@@ -180,7 +181,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
                 .startDate(item.getCreateDate())
-                .model(item)
+                .model(taskMessageDto)
                 .nextExecuteUser(item.getNextExecuteIds())
                 .build();
     }
@@ -193,7 +194,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
      * @param taskV2Model       代办信息
      */
     private void createNewTodo(JgEquipTransfer transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model, FlowStatusEnum statusEnum) {
-        transfer.setInstanceId(workflowResultDto.getInstanceId());
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtil.copyProperties(transfer, taskMessageDto);
+
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         TaskModelDto taskModelDto = TaskModelDto.builder()
                 .flowCreateDate(taskV2Model.getFlowCreateDate())
@@ -212,7 +215,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())
                 .startDate(taskV2Model.getStartDate())
-                .model(transfer)
+                .model(taskMessageDto)
                 .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
                 .build();
         commonService.buildTaskModel(Collections.singletonList(taskModelDto));
@@ -292,6 +295,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 transfer.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 transfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 transfer.setNextTaskId(workflowResultDto.getNextTaskId());
+                transfer.setInstanceId(workflowResultDto.getInstanceId());
 
                 updateById(transfer);
                 // 上个代办改为已办
@@ -365,6 +369,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 jgEquipTransfer.setPromoter(RequestContext.getExeUserId());
                 jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 jgEquipTransfer.setNextTaskId(workflowResultDto.getNextTaskId());
+                jgEquipTransfer.setInstanceId(workflowResultDto.getInstanceId());
                 // 上个代办改为已办
                 taskV2Model = this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.TO_BE_FINISHED);
                 // 创建新的代办