fix(jg):回退代办摘要的修改

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

@@ -116,7 +116,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     @Autowired
     TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
 
-    private static String template = "来自企业（%s）的业务办理";
+    private static String template = "来自企业（%s）的业务办理，【申请单号：%s】";
 
     public static String  JG_COMAPNY_TYPE = "监管机构";
     @Autowired
@@ -288,7 +288,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
      * @return 摘要
      */
     private String buildTaskContent(JgChangeRegistrationName dto) {
-        return String.format(template, dto.getUseUnitCreditCode());
+        return String.format(template, dto.getUseUnitCreditCode(), dto.getApplyNo());
     }
 
 

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

@@ -885,8 +885,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @deprecated 动态获取
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
-        String result = "来自%s【%s】的业务办理";
-        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"));
+        String result = "来自%s【%s】的业务办理，【申请单号：%s】";
+        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"), jgChangeRegistrationReform.getApplyNo());
     }
 
     /**

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

@@ -1212,8 +1212,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @deprecated 动态获取
      */
     public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
-        String result = "来自%s【%s】的业务办理";
-        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), Optional.ofNullable(transfer.getSupervisoryCode()).orElse("无"));
+        String result = "来自%s【%s】的业务办理，【申请单号：%s】";
+        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), Optional.ofNullable(transfer.getSupervisoryCode()).orElse("无"), Optional.ofNullable(transfer.getApplyNo()).orElse("无"));
     }
 
     public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {

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

@@ -579,7 +579,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 dto.setFlowCreateDate(new Date());
                 dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
                 dto.setFlowCode(obj.getNextTaskId());
-                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 dto.setTaskCode(obj.getApplyNo());
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
                 dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
@@ -601,7 +601,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 //行数据
                 dto.setModel(obj);
                 //摘要 按原有规则组装
-                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 //申请单号
                 dto.setTaskCode(obj.getApplyNo());
                 //业务类型枚举code值
@@ -1091,7 +1091,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
 
     private String buildTaskContent(JgChangeRegistrationUnit obj) {
-        return "来自"+ EquipmentClassifityEnum.getNameByCode(obj.getEquList()) +"【"+obj.getSupervisoryCode()+"】的业务办理";
+        return "来自"+ EquipmentClassifityEnum.getNameByCode(obj.getEquList()) +"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】";
     }
 
 

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

@@ -273,9 +273,10 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         dto.setModel(taskMessageDto);
         //摘要 按原有规则组装
         dto.setTaskContent(
-                String.format("来自%s【%s】的业务办理",
-                ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "" : jgEnableDisable.getEquList(),
-                ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "" : jgEnableDisable.getSupervisoryCode()));
+                String.format("来自%s【%s】的业务办理，【申请单号：%s】",
+                        ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "" : jgEnableDisable.getEquList(),
+                        ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "" : jgEnableDisable.getSupervisoryCode(),
+                        jgEnableDisable.getApplyNo()));
         //申请单号
         dto.setTaskCode(jgEnableDisable.getApplyNo());
         //业务类型枚举code值
@@ -353,7 +354,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getExecuteSequence());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), item.getSupervisoryCode()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), 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/JgEquipTransferServiceImpl.java

@@ -188,7 +188,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private TaskModelDto buildTempTaskModelDto(JgEquipTransfer item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
                 .relationId(item.getSequenceNbr() + "")
@@ -235,8 +235,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
-                .taskDesc(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
@@ -270,8 +270,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .flowStatus(statusEnum.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(statusEnum.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理", transfer.getEquList(), transfer.getSupervisoryCode()))
-                .taskDesc(String.format("来自%s【%s】的业务办理", transfer.getEquList(), transfer.getSupervisoryCode()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
                 .startUserCompanyName(reginParams.getCompany().getCompanyName())
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())

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

@@ -683,7 +683,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), StringUtils.isEmpty(item.getFactoryNum()) ? "" : item.getFactoryNum()));
+            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);

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

@@ -499,7 +499,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskMessageDto.setNextTaskId(obj.getNextTaskId());
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode(), obj.getApplyNo()));
             //申请单号
             dto.setTaskCode(obj.getApplyNo());
             //业务类型枚举code值
@@ -540,7 +540,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(),  StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(),  StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode(), 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/JgMaintenanceContractServiceImpl.java

@@ -735,7 +735,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             }
         }
         supervisoryCode = StringUtils.isEmpty(supervisoryCode) ? "无" : supervisoryCode;
-        String format = String.format("来自%s【%s】等的业务办理", equList, supervisoryCode);
+        String format = String.format("来自%s【%s】等的业务办理，【申请单号：%s】等", equList, supervisoryCode, dto.getApplyNo());
         return format;
     }
 }
\ No newline at end of file

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

@@ -471,7 +471,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private TaskModelDto buildTempTaskModelDto(JgReformNotice item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
                 .relationId(item.getSequenceNbr() + "")
@@ -515,8 +515,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), item.getSupervisoryCode()))
-                .taskDesc(String.format("来自%s【%s】的业务办理", item.getEquList(), item.getSupervisoryCode()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
@@ -856,8 +856,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .flowStatus(statusEnum.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(statusEnum.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), "")))
-                .taskDesc(String.format("来自%s【%s】的业务办理", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), "")))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
                 .startUserCompanyName(transfer.getCreateUserCompanyName())
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())

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

@@ -71,7 +71,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PAGE_KEY = "jgScrapCancelAdd";
-    private static final String template = "来自%s【%s】【%s】的业务办理";
+    private static final String template = "来自%s【%s】【%s】的业务办理，【申请单号：%s】";
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
@@ -278,7 +278,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
             taskModelDto.setTaskName(taskName);
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
-            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType()));
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
             taskModelDto.setTaskDesc("");
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
             taskModelDto.setTaskTypeLabel(businessTypeJudgment(scrapCancel.getCancelType()).getName());
@@ -302,7 +302,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(scrapCancel, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
-            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType()));
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
             taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
@@ -326,11 +326,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
      *
      * @return 摘要
      */
-    private String buildTaskContent(String equList, String supervisoryCode, String cancelType) {
+    private String buildTaskContent(String equList, String supervisoryCode, String cancelType, String applyNo) {
         //    来自电梯【X3100-123456】【移装注销】的业务办理【申请单号：ABCD0000001】
         String type = "1".equals(cancelType) ? "报废注销" : "移装注销";
         String equListName = EquipmentClassifityEnum.getNameByCode(equList);
-        return String.format(template, equListName, Objects.isNull(supervisoryCode) ? "无" : supervisoryCode, type);
+        return String.format(template, equListName, Objects.isNull(supervisoryCode) ? "无" : supervisoryCode, type, applyNo);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -465,7 +465,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgScrapCancelDto, operate);
         taskV2Model.setTaskDesc("");
-        taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType()));
+        taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
         taskV2Model.setTaskName(taskName);
         taskV2Model.setTaskCode(jgScrapCancelDto.getApplyNo());
         taskV2Model.setRelationId(jgScrapCancelDto.getInstanceId());

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

@@ -445,7 +445,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             BeanUtils.copyProperties(obj, taskMessageDto);
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode(), obj.getApplyNo()));
             //申请单号
             dto.setTaskCode(obj.getApplyNo());
             //业务类型枚举code值
@@ -530,7 +530,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
 
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode(), 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/JgUseRegistrationServiceImpl.java

@@ -546,7 +546,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     // 数据参数
                     dto.setModel(taskMessageDto);
                     // 摘要
-                    dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理");
+                    dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
                     // 申请单号
                     dto.setTaskCode(jgUseRegistration.getApplyNo());
                     // 业务类型
@@ -739,7 +739,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 String equType = this.baseMapper.getEquType(String.valueOf(map.get("EQU_LIST_CODE")));
                 TaskModelDto dto = TaskModelDto.builder()
                         .model(BeanUtil.copyProperties(useRegistration, TaskMessageDto.class))
-                        .taskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(useRegistration.getSupervisoryCode()) ? "无" : useRegistration.getSupervisoryCode()) + "】的业务办理")
+                        .taskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(useRegistration.getSupervisoryCode()) ? "无" : useRegistration.getSupervisoryCode()) + "】等的业务办理,"
+                                + "【申请单号：" + useRegistration.getApplyNo() + "】")
                         .taskCode(useRegistration.getApplyNo())
                         .taskType(String.valueOf(BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode()))
                         .relationId(String.valueOf(useRegistration.getSequenceNbr()))
@@ -1123,7 +1124,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!jgUseRegistrationEqList.isEmpty()) {
             String equId = jgUseRegistrationEqList.get(0).getEquId();
             taskMessageDto.setEquipId(equId);
-            dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理");
+            dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
         }
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());

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

@@ -372,7 +372,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             BeanUtil.copyProperties(vehicleInformation, taskMessageDto);
             taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
             dto.setModel(taskMessageDto);
-            dto.setTaskContent("来自车用气瓶【" + vehicleInformation.getCarNumber() + "】的登记业务办理");
+            dto.setTaskContent("来自车用气瓶【" + vehicleInformation.getCarNumber() + "】的登记业务办理," + "【申请单号：" + vehicleInformation.getApplyNo() + "】");
             dto.setTaskCode(vehicleInformation.getApplyNo());
             dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getCode()));
             dto.setRelationId(String.valueOf(vehicleInformation.getSequenceNbr()));
@@ -830,7 +830,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         BeanUtil.copyProperties(jgVehicleInformation, taskMessageDto);
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-        dto.setTaskContent("来自车用气瓶【" + jgVehicleInformation.getCarNumber() + "】的登记业务办理");
+        dto.setTaskContent("来自车用气瓶【" + jgVehicleInformation.getCarNumber() + "】的登记业务办理," + "【申请单号：" + jgVehicleInformation.getApplyNo() + "】");
         dto.setFlowCode(jgVehicleInformation.getNextTaskId());
         list.add(dto);
         commonService.buildTaskModel(list);