fix（注销报废）:暂存

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

@@ -253,11 +253,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             equipList.add(jgRelationEquip);
         }
         this.saveBatch(list);
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            // 新增代办
-            for (JgScrapCancel jgScrapCancel : list) {
-                this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
-            }
+        // 新增代办
+        for (JgScrapCancel jgScrapCancel : list) {
+            this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
         }
         List<JgScrapCancelEq> jgScrapCancelEqList = equipList.stream().map(t -> {
             List<JgScrapCancel> collect = list.stream().filter(item -> t.getEquipTransferId().equals(item.getApplyNo())).collect(Collectors.toList());
@@ -269,8 +267,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        TaskModelDto taskModelDto = new TaskModelDto();
         if ("1".equals(submitType)) {
-            TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
             taskModelDto.setTaskName(taskName);
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
@@ -295,8 +293,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(scrapCancel, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
-            commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+        } else {
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(scrapCancel, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getSupervisoryCode(),
+                    scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
+            taskModelDto.setTaskCode(scrapCancel.getApplyNo());
+            taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
+            taskModelDto.setRelationId(taskMessageDto.getSequenceNbr() + "");
         }
+        commonService.buildTaskModel(Collections.singletonList(taskModelDto));
     }
 
     private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {
@@ -346,7 +353,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                     List<ActWorkflowStartDTO> list = new ArrayList<>();
                     ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                    dto.setProcessDefinitionKey("unitRename");
+                    dto.setProcessDefinitionKey("scrapCancelNew");
                     dto.setBusinessKey(jgScrapCancelDto.getApplyNo());
                     dto.setCompleteFirstTask(true);
                     dto.setNextExecuteUserCompanyCode(jgScrapCancelDto.getReceiveOrgCode());
@@ -368,6 +375,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     // 创建待办
                     JgScrapCancel bean = new JgScrapCancel();
                     BeanUtil.copyProperties(jgScrapCancelDto, bean);
+                    commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
                     createTaskModel(bean, taskName, "1", nextUserIds);
                 } catch (Exception e) {
                     log.error("提交失败：{}", e);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -105,7 +105,8 @@
     "type": "109",
     "pageType": "draft",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"  },
+    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
   {
     "type": "109",
     "pageType": "look",
@@ -180,6 +181,12 @@
   },
   {
     "type": "113-1",
+    "pageType": "draft",
+    "name": "移装报废",
+    "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "113-1",
     "pageType": "look",
     "name": "移装报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"