暂存任务及撤回任务修改

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

@@ -82,9 +82,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     IJgInstallationNoticeService jrmInstallationNoticeService;
 
-    @Autowired
-    private CommonMapper commonMapper;
-
     /**
      * 分页查询
      */
@@ -270,12 +267,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     @Transactional
     public void revocation(String instanceId) {
-        // 执行流程
         JgMaintenanceContract contract = new JgMaintenanceContract();
         LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
         lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
+        contract = this.getOne(lambda);
         ProcessTaskDTO processTaskDTO = workflowService.rollBack(instanceId);
         String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -291,7 +288,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         // 更新下一步可执行人
         String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
         contract.setNextExecuteUserIds(nextUserIds);
-        this.update(contract, lambda);
+        this.updateById(contract);
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(contract));
         jsonObject.put("nextTaskId", contract.getNextTaskId());
@@ -299,6 +296,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(contract.getStatus()));
         jsonObject.put("flowStatusLabel", contract.getStatus());
+        jsonObject.put("changeCertificate", null);
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -430,6 +428,17 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setNextExecuteUserIds(nextUserIds);
                 executeOneStep(contract, taskName, nextUserIds, "0");
             }
+            commonService.deleteTaskModel(contract.getSequenceNbr()+"");
+        } else {
+            List<TaskModelDto> modelDtos = new ArrayList<>();
+            TaskModelDto dto = new TaskModelDto();
+            dto.setModel(contract);
+            dto.setTaskContent(buildTaskContent(contract));
+            dto.setTaskCode(contract.getApplyNo());
+            dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+            dto.setRelationId(contract.getSequenceNbr() + "");
+            modelDtos.add(dto);
+            commonService.buildTaskModel(modelDtos);
         }
         updateById(contract);
         return true;

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

@@ -60,6 +60,12 @@
     "url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=edit&roleIds={roleIds}&userId={userId}"
   },
   {
+  "type": "106",
+  "pageType": "draft",
+  "name": "维保备案",
+  "url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
     "type": "106",
     "pageType": "edit",
     "name": "维保备案",