Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
@@ -67,8 +66,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 
 /**
  * 移装变更登记登记服务实现类
@@ -589,12 +588,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         //移装变更详情
         JgChangeRegistrationTransfer transfer = this.getById(sequenceNbr);
         //查询设备详情
-        //String equipId = jgChangeRegistrationTransferEqMapper.getEquipIdByEquipTransferId(sequenceNbr);
-
+        JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
         if (ValidationUtil.equals(FlowStatusEnum.TO_BE_FINISHED.getName(), transfer.getStatus())) {
             // 执行完成时查询历史表
-            JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
             if (!ValidationUtil.isEmpty(historyData)) {
                 Map<String, Object> newPosition = JSON.parseObject(historyData.getChangeData(), Map.class);
                 resultDataMap.putAll(newPosition);
@@ -606,15 +603,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
         } else {
             // 非执行完成状态显示最新设备信息
-            //Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
-            //resultDataMap.putAll(equipDetailMap);
+            Map<String, Object> changeData = JSON.parseObject(historyData.getChangeData(), Map.class);
+            List<JgUseRegistrationManage> registrationList = (List<JgUseRegistrationManage>) changeData.get("registrationList");
+            List<String> ids = registrationList.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
+            List<JgUseRegistrationManage> newRegistrationList = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
             if (!ValidationUtil.isEmpty(transfer)) {
                 Map<String, Object> transferToMap = Bean.BeantoMap(transfer);
                 resultDataMap.putAll(transferToMap);
             }
-            JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
-            Map<String, Object> changeData = JSON.parseObject(historyData.getChangeData(), Map.class);
             // 省市区街道字段等业务字段
             resultDataMap.put("transferProvince", changeData.get("transferProvince"));
             resultDataMap.put("transferCity", changeData.get("transferCity"));
@@ -631,7 +627,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             resultDataMap.put("transferUseInfo", changeData.get("transferUseInfo"));
             //resultDataMap.put("useInnerCode", equipDetailMap.get("equCode"));
             resultDataMap.put("receiveCompanyCode", transfer.getReceiveCompanyCode() + "_" + transfer.getReceiveOrgName());
-            resultDataMap.put("registrationList", changeData.get("registrationList"));
+            resultDataMap.put("registrationList", newRegistrationList);
         }
         String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString();
         if (StringUtil.isNotEmpty(transferSafetyManager)) {
@@ -955,10 +951,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
     private void updateUseRegistrationManage(JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
         JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
-        List<Map<String, Object>> registrationList = (List<Map<String, Object>>) historyJson.get("registrationList");
-        List<String> ids = registrationList.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
-        List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
-        for (JgUseRegistrationManage registrationManage : list) {
+        List<JgUseRegistrationManage> registrationList = (List<JgUseRegistrationManage>) historyJson.get("registrationList");
+        for (JgUseRegistrationManage registrationManage : registrationList) {
             registrationManage.setReceiveOrgName(transfer.getReceiveOrgName());
             registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode());
             registrationManage.setAuditPassDate(transfer.getAuditPassDate());
@@ -967,7 +961,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 registrationManage.setUseRegistrationCode(useRegistrationCode);
             }
         }
-        useRegistrationManageService.updateBatchById(list);
+        useRegistrationManageService.updateBatchById(registrationList);
+        historyData.setChangeData(JSONObject.toJSONString(registrationList));
     }
 
     /**
@@ -1368,12 +1363,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     /**
      * 新增代办任务
      */
-    private void createToDoTask(List<WorkflowResultDto> sorkflows, JgChangeRegistrationTransfer transfer, String submitType) {
-        if (!ValidationUtil.isEmpty(sorkflows)) {
+    private void createToDoTask(List<WorkflowResultDto> workflows, JgChangeRegistrationTransfer transfer, String submitType) {
+        if (!ValidationUtil.isEmpty(workflows)) {
             List<TaskModelDto> toDoTasklist = new ArrayList<>();
-            for (WorkflowResultDto sorkflow : sorkflows) {
+            for (WorkflowResultDto workflow : workflows) {
                 TaskModelDto toDoTask = new TaskModelDto();
-                toDoTask.setTaskName(sorkflow.getTaskName());
+                toDoTask.setTaskName(workflow.getTaskName());
                 toDoTask.setFlowCreateDate(transfer.getCreateDate());
                 toDoTask.setTaskCode(transfer.getApplyNo());
                 toDoTask.setTaskContent(this.getSummaryInfo(transfer));
@@ -1381,13 +1376,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
                 toDoTask.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
                 toDoTask.setRelationId(transfer.getInstanceId());
-                toDoTask.setExecuteUserIds(sorkflow.getNextExecutorUserIds());
+                toDoTask.setExecuteUserIds(workflow.getNextExecutorUserIds());
                 FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
                 toDoTask.setTaskStatus(flowStatusEnum.getCode());
                 toDoTask.setTaskStatusLabel(flowStatusEnum.getName());
                 toDoTask.setFlowStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
                 toDoTask.setFlowStatusLabel(transfer.getStatus());
-                toDoTask.setFlowCode(sorkflow.getNextTaskId());
+                toDoTask.setFlowCode(workflow.getNextTaskId());
                 toDoTask.setStartUserId(transfer.getCreateUserId());
                 toDoTask.setStartUser(transfer.getCreateUserName());
                 toDoTask.setStartUserCompanyName(transfer.getCreateUserCompanyName());

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

@@ -151,8 +151,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             }
         } else {
             // 显示最新的设备信息
-            List<JgReformNoticeEq> noticeEqs = jgReformNoticeEqMapper.selectList(new LambdaQueryWrapper<JgReformNoticeEq>()
-                    .eq(JgReformNoticeEq::getEquipTransferId, sequenceNbr));
+            List<JgReformNoticeEq> noticeEqs = jgReformNoticeEqMapper.selectList(new LambdaQueryWrapper<JgReformNoticeEq>().eq(JgReformNoticeEq::getEquipTransferId, sequenceNbr));
             List<String> ids = noticeEqs.stream().map(JgReformNoticeEq::getEquId).collect(Collectors.toList());
             Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
             List<Map<String, Object>> equipListMaps = getEquipListMaps(equips);
@@ -342,11 +341,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // 删除单子
             this.baseMapper.deleteById(notice.getSequenceNbr());
             // 删除对应eq
-            jgReformNoticeEqMapper.delete(new LambdaQueryWrapper<JgReformNoticeEq>()
-                    .eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr()));
+            jgReformNoticeEqMapper.delete(new LambdaQueryWrapper<JgReformNoticeEq>().eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr()));
             // 删除单子对应历史表数据
-            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getSequenceNbr()));
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, notice.getSequenceNbr()));
         });
         return Boolean.TRUE;
     }
@@ -431,12 +428,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             String equListCode = String.valueOf(jsonObject.get("EQU_LIST_CODE"));
             String equCategoryCode = String.valueOf(jsonObject.get("EQU_CATEGORY_CODE"));
             notice.setEquListCode(equListCode);
-            EquipmentCategory equipmentCategory1 = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>()
-                    .eq(EquipmentCategory::getCode, equListCode));
+            EquipmentCategory equipmentCategory1 = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, equListCode));
             notice.setEquListName(equipmentCategory1.getName());
             notice.setEquCategoryCode(equCategoryCode);
-            EquipmentCategory equipmentCategory2 = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>()
-                    .eq(EquipmentCategory::getCode, equCategoryCode));
+            EquipmentCategory equipmentCategory2 = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, equCategoryCode));
             notice.setEquCategoryName(equipmentCategory2.getName());
 
             // 统计用
@@ -492,7 +487,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("知保存失败！");
+            throw new BadRequest("告知单保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }
@@ -507,9 +502,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // 流程中校验
             LambdaQueryWrapper<JgReformNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(JgReformNoticeEq::getEquipTransferId, jgReformNotice.getSequenceNbr());
-            JgReformNoticeEq jgRelationEquip = jgReformNoticeEqMapper.selectOne(queryWrapper);
-            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                    .equipRepeatUsedCheck(jgRelationEquip.getEquId(), jgReformNotice.getInstallUnitCreditCode());
+            List<JgReformNoticeEq> noticeEqs = jgReformNoticeEqMapper.selectList(queryWrapper);
+            for (JgReformNoticeEq noticeEq : noticeEqs) {
+                EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).equipRepeatUsedCheck(noticeEq.getEquId(), jgReformNotice.getInstallUnitCreditCode());
+            }
         }
     }
 
@@ -520,14 +516,12 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         LambdaQueryWrapper<JgReformNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr());
         JgReformNoticeEq jgRelationEquip = jgReformNoticeEqMapper.selectOne(queryWrapper);
-        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                .delDataForCheckEquipRepeatUsed(Collections.singletonList(jgRelationEquip.getEquId()), notice.getInstallUnitCreditCode());
+        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).delDataForCheckEquipRepeatUsed(Collections.singletonList(jgRelationEquip.getEquId()), notice.getInstallUnitCreditCode());
     }
 
     private void rollBackForDelRedisData() {
         FlowingEquipRedisContext.getContext().forEach(e -> {
-            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                    .delDataForCheckWithKey(e.getData(), e.getRedisKey());
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey());
         });
     }
 
@@ -551,13 +545,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     }
 
     private TaskModelDto buildTempTaskModelDto(JgReformNotice item) {
-        return TaskModelDto.builder()
-                .model(item)
-                .taskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquListName(), item.getApplyNo()))
-                .taskCode(item.getApplyNo())
-                .taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
-                .relationId(item.getSequenceNbr() + "")
-                .build();
+        return TaskModelDto.builder().model(item).taskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquListName(), item.getApplyNo())).taskCode(item.getApplyNo()).taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode()).relationId(item.getSequenceNbr() + "").build();
     }
 
     /**
@@ -581,29 +569,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private TaskModelDto buildTaskModelDto(JgReformNotice item, WorkflowResultDto workflowResultDto) {
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(item, taskMessageDto);
-        return TaskModelDto.builder()
-                .flowCreateDate(item.getCreateDate())
-                .taskName(workflowResultDto.getNextTaskName())
-                .taskCode(item.getApplyNo())
-                .relationId(workflowResultDto.getInstanceId())
-                .taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
-                .taskTypeLabel(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName())
-                .relationId(item.getInstanceId())
-                .executeUserIds(workflowResultDto.getNextExecutorUserIds())
-                .taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
-                .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
-                .flowCode(workflowResultDto.getNextTaskId())
-                .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquList(), item.getApplyNo()))
-                .taskDesc(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquList(), item.getApplyNo()))
-                .startUserId(item.getCreateUserId())
-                .startUser(item.getCreateUserName())
-                .startUserCompanyName(item.getCreateUserCompanyName())
-                .startDate(item.getCreateDate())
-                .model(taskMessageDto)
-                .nextExecuteUser(item.getNextExecuteIds())
-                .build();
+        return TaskModelDto.builder().flowCreateDate(item.getCreateDate()).taskName(workflowResultDto.getNextTaskName()).taskCode(item.getApplyNo()).relationId(workflowResultDto.getInstanceId()).taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode()).taskTypeLabel(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName()).relationId(item.getInstanceId()).executeUserIds(workflowResultDto.getNextExecutorUserIds()).taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode()).taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName()).flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode()).flowCode(workflowResultDto.getNextTaskId()).flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName()).taskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquList(), item.getApplyNo())).taskDesc(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquList(), item.getApplyNo())).startUserId(item.getCreateUserId()).startUser(item.getCreateUserName()).startUserCompanyName(item.getCreateUserCompanyName()).startDate(item.getCreateDate()).model(taskMessageDto).nextExecuteUser(item.getNextExecuteIds()).build();
     }
 
     /**
@@ -834,8 +800,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                         queryWrapper2.eq(RegistrationInfo::getRecord, noticeEq.getEquId());
                         RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
 
-                        String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine())
-                                .orElse(tzsJgRegistrationInfo.getEquCategory());
+                        String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine()).orElse(tzsJgRegistrationInfo.getEquCategory());
                         String registrationCode = equCode + jgReformNotice.getReceiveCompanyCode() + ym;
                         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                         String deviceRegistrationCode = responseModel.getResult();
@@ -889,16 +854,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
 
     private void saveHisDataBeforeUpdate(JgReformNotice jgReformNotice, JSONObject jsonObject) {
-        commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName(),
-                new JSONObject(jsonObject), null, String.valueOf(jgReformNotice.getSequenceNbr()));
+        commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName(), new JSONObject(jsonObject), null, String.valueOf(jgReformNotice.getSequenceNbr()));
     }
 
     public InstanceRuntimeData buildInstanceRuntimeData(JgReformNotice jgReformNotice) {
-        return InstanceRuntimeData.builder()
-                .nextExecuteUserIds(jgReformNotice.getNextExecuteUserIds())
-                .promoter(jgReformNotice.getPromoter())
-                .nextTaskId(jgReformNotice.getNextTaskId())
-                .build();
+        return InstanceRuntimeData.builder().nextExecuteUserIds(jgReformNotice.getNextExecuteUserIds()).promoter(jgReformNotice.getPromoter()).nextTaskId(jgReformNotice.getNextTaskId()).build();
     }
 
     /**
@@ -908,14 +868,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
      * @return 代办信息
      */
     private TaskV2Model updateLastTodo(JgReformNotice jgReformNotice, FlowStatusEnum statusEnum) {
-        return commonService.updateTaskModel(MapBuilder.<String, Object>create()
-                .put("taskStatus", statusEnum.getCode())
-                .put("taskStatusLabel", statusEnum.getName())
-                .put("flowStatus", statusEnum.getCode())
-                .put("flowStatusLabel", statusEnum.getName())
-                .put("relationId", jgReformNotice.getInstanceId())
-                .put("model", jgReformNotice)
-                .build());
+        return commonService.updateTaskModel(MapBuilder.<String, Object>create().put("taskStatus", statusEnum.getCode()).put("taskStatusLabel", statusEnum.getName()).put("flowStatus", statusEnum.getCode()).put("flowStatusLabel", statusEnum.getName()).put("relationId", jgReformNotice.getInstanceId()).put("model", jgReformNotice).build());
     }
 
     /**
@@ -928,28 +881,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private void createNewTodo(JgReformNotice transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model, FlowStatusEnum statusEnum) {
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(transfer, taskMessageDto);
-        TaskModelDto taskModelDto = TaskModelDto.builder()
-                .flowCreateDate(taskV2Model.getFlowCreateDate())
-                .taskName(workflowResultDto.getNextTaskName())
-                .taskCode(taskV2Model.getTaskCode())
-                .taskType(taskV2Model.getTaskType())
-                .taskTypeLabel(taskV2Model.getTaskTypeLabel())
-                .relationId(taskV2Model.getRelationId())
-                .executeUserIds(workflowResultDto.getNextExecutorUserIds())
-                .taskStatusLabel(statusEnum.getName())
-                .flowStatus(statusEnum.getCode())
-                .flowCode(workflowResultDto.getNextTaskId())
-                .flowStatusLabel(statusEnum.getName())
-                .taskContent(String.format("来自%s的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getApplyNo()))
-                .taskDesc(String.format("来自%s的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getApplyNo()))
-                .startUserCompanyName(transfer.getCreateUserCompanyName())
-                .startUserId(taskV2Model.getStartUserId())
-                .startUser(taskV2Model.getStartUser())
-                .startDate(taskV2Model.getStartDate())
-                .model(taskMessageDto)
-                .pageType(statusEnum.getCode() == 6614 ? "edit" : "look")
-                .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
-                .build();
+        TaskModelDto taskModelDto = TaskModelDto.builder().flowCreateDate(taskV2Model.getFlowCreateDate()).taskName(workflowResultDto.getNextTaskName()).taskCode(taskV2Model.getTaskCode()).taskType(taskV2Model.getTaskType()).taskTypeLabel(taskV2Model.getTaskTypeLabel()).relationId(taskV2Model.getRelationId()).executeUserIds(workflowResultDto.getNextExecutorUserIds()).taskStatusLabel(statusEnum.getName()).flowStatus(statusEnum.getCode()).flowCode(workflowResultDto.getNextTaskId()).flowStatusLabel(statusEnum.getName()).taskContent(String.format("来自%s的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getApplyNo())).taskDesc(String.format("来自%s的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getApplyNo())).startUserCompanyName(transfer.getCreateUserCompanyName()).startUserId(taskV2Model.getStartUserId()).startUser(taskV2Model.getStartUser()).startDate(taskV2Model.getStartDate()).model(taskMessageDto).pageType(statusEnum.getCode() == 6614 ? "edit" : "look").nextExecuteUser(workflowResultDto.getNextExecutorRoleIds()).build();
         commonService.buildTaskModel(Collections.singletonList(taskModelDto));
     }
 }
\ No newline at end of file