更新

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

@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
@@ -315,7 +316,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Transactional
     public void revocation(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String taskName = "";
+        String taskCode = "";
         JgMaintenanceContract jgMaintenanceContract = new JgMaintenanceContract();
         LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
         lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
@@ -324,9 +325,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             workFlowFeginService.rollBack(instanceId);
             JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-            taskName = nextTask.getString("name");
+            taskCode = nextTask.getString("name");
             if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
                 String nextTaskId = nextTask.getString("id");
+                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
+                JSONObject result = nodeInfo.getResult();
+                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
+                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
                 AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
@@ -338,9 +343,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!ObjectUtils.isEmpty(taskName)) {
+        if (!ObjectUtils.isEmpty(taskCode)) {
 
-            jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getRollBack());
+            jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         }
         String join = String.join(",", roleList);
         jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
@@ -381,7 +386,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
 
         // 新增编辑
         if ("add".equals(String.valueOf(map.get("pageType")))) {
-            contract.setStatus(SUBMIT_DATA.equals(submit) ? MaintenceStatusEnum.SUBMIT.getPass() : MaintenceStatusEnum.RECEIVE.getPass());
+            contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
             this.save(contract);
         } else {
             this.getBaseMapper().updateById(contract);
@@ -422,16 +427,20 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate){
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = "";
-        String taskName = FlowStatusEnum.TO_BE_FINISHED.getName();
+        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         ArrayList<String> roleList = new ArrayList<>();
         JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(sequenceNbr);
         try {
             // 查询下节点任务
+
             JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
             if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
                 JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
                 String nextTaskId = nextTask.getString("id");
-                taskName = nextTask.getString("name");
+                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
+                JSONObject result = nodeInfo.getResult();
+                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
+                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
                 AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
@@ -443,7 +452,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskName)){
+        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)){
             role= String.join(",", roleList);
             jgMaintenanceContract.setNextExecuteIds(role);
             jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
@@ -455,15 +464,15 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             }
             if ("0".equals(operate)){
                 // 通过操作
-                jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getPass());
+                jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
             }else {
                 // 驳回操作
-                jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getReject());
+                jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgMaintenanceContract.setPromoter(null);
             }
 
         }else {
-            jgMaintenanceContract.setStatus(taskName);
+            jgMaintenanceContract.setStatus(taskCode);
         }
         this.getBaseMapper().updateById(jgMaintenanceContract);