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

@@ -301,6 +301,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
+            taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
             taskModelDto.setRelationId(taskMessageDto.getSequenceNbr() + "");
         }
         commonService.buildTaskModel(Collections.singletonList(taskModelDto));
@@ -532,9 +533,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     @Transactional
     public void revocation(String instanceId) {
         ReginParams reginParams = this.getSelectedOrgInfo();
-        JgScrapCancel jgScrapCancel = new JgScrapCancel();
         LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
         lambda.eq(JgScrapCancel::getInstanceId, instanceId);
+        JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
         ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(workflowResultDto.getNextTaskName())) {
@@ -547,7 +548,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jgScrapCancel.setNextExecuteUserIds(nextUserIds);
         jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
         jgScrapCancel.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
-        this.update(jgScrapCancel, lambda);
+        this.updateById(jgScrapCancel);
 
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgScrapCancel));

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

@@ -205,6 +205,12 @@
   },
   {
     "type": "113-2",
+    "pageType": "draft",
+    "name": "注销报废",
+    "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "113-2",
     "pageType": "look",
     "name": "注销报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"