维修告知修改

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

@@ -340,6 +340,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                     notice.setInstanceId(workflowResultDto.getInstanceId());
                     notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    notice.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
                     jgMaintainNoticeMapper.updateById(notice);
                     // 如果为保存并提交，则创建代办
                     buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
@@ -372,6 +373,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                     notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                     notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    notice.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
                     jgMaintainNoticeMapper.updateById(notice);
                     // 上个代办改为已办
                     HashMap<String, Object> map = new HashMap<>();
@@ -650,7 +652,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskMessageDto.setNextTaskId(obj.getNextTaskId());
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode(), obj.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s的业务办理，【申请单号%s】",obj.getEquList(), obj.getApplyNo()));
             //申请单号
             dto.setTaskCode(obj.getApplyNo());
             //业务类型枚举code值
@@ -691,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维修告知业务申请，【申请单号%s】", item.getCreateUserName(), 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/resources/json/urlInfo.json

@@ -57,7 +57,7 @@
     "type": "104",
     "pageType": "draft",
     "name": "维修告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1736722439125102594&roleIds={roleIds}&userId={userId}&formType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1736591289295597569&roleIds={roleIds}&userId={userId}&formType=edit"
   },
   {
     "type": "104",