更新

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/JgUseRegistrationServiceImpl.java

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
 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.mapper.InspectionDetectionInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
@@ -221,7 +222,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     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 taskCode = "已完成";
+        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         ArrayList<String> roleList = new ArrayList<>();
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
         try {
@@ -246,7 +247,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!"已完成".equals(taskCode)) {
+        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             role = String.join(",", roleList);
             jgUseRegistration.setNextExecuteIds(role);
             jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
@@ -329,7 +330,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     public void withdraw(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String taskName = "";
+        String taskCode = "";
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
         LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
         lambda.eq(JgUseRegistration::getInstanceId, instanceId);
@@ -338,9 +339,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             workFlowFeginService.rollBack(instanceId);
             JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-            taskName = 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) {
@@ -352,9 +357,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!ObjectUtils.isEmpty(taskName)) {
+        if (!ObjectUtils.isEmpty(taskCode)) {
 
-            jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskName).getRollBack());
+            jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         }
         String join = String.join(",", roleList);
         jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());