告知摘要修改

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

@@ -765,7 +765,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             BeanUtils.copyProperties(obj, taskMessageDto);
             dto.setModel(taskMessageDto);
             // 摘要 按原有规则组装
-            dto.setTaskContent(String.format("发起了【安装告知】的业务办理，【申请单号：%s】",  obj.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",obj.getEquList(), obj.getApplyNo()));
             // 申请单号
             dto.setTaskCode(obj.getApplyNo());
             // 业务类型枚举code值
@@ -798,7 +798,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("发起了【安装告知】的业务办理，【申请单号：%s】",  item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",item.getEquList(), item.getApplyNo()));
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);

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

@@ -693,7 +693,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskMessageDto.setNextTaskId(item.getNextTaskId());
             taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号%s】",item.getEquList(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",item.getEquList(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
             if (bool) {
                 // 删除暂存时生成的待办

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

@@ -925,7 +925,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.getEquListName(), 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.getEquListName(), 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