From 1352111b2fe995dd0a20327ea0a6a242fe727db9 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 16:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=20=E6=9B=B4?= =?UTF-8?q?=E5=90=8D=20=E5=88=A0=E9=99=A4=E8=BF=87=E6=89=8D=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=20=E6=B2=A1=E5=88=A0=E9=99=A4=E8=BF=87=E4=B8=8D?= =?UTF-8?q?=E5=8F=91=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 23 +++++++++++++------ .../adc/da/workFlow/entity/EndPrcName.java | 9 ++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index fa6e0c0e..bc562920 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1354,7 +1354,9 @@ public class WorkFlowController extends BaseController { String prcName2 = bussSort2 + "-" + esName2 + "-计划立项"; String s1 = workFlowFeignClient.endPrcName(prcName1, esId1); String s2 = workFlowFeignClient.endPrcName(prcName2, esId2); - if(s1.equals("成功") && s2.equals("成功")){ + String[] split1 = s1.split("-"); + String[] split2 = s2.split("-"); + if(split1[0].equals("成功") && split2[0].equals("成功")){ return Result.success(); }else { return Result.error(); @@ -1362,12 +1364,19 @@ public class WorkFlowController extends BaseController { } }else { s = workFlowFeignClient.endPrcName(prcName, esId); - Map objectObjectMap = new HashMap<>(); - objectObjectMap.put("ids",esId); - objectObjectMap.put("prcCreateUser","xxx"); - String s1 = JSONObject.toJSONString(objectObjectMap); - if(s.equals("成功")){ - return Result.success(s1); + String[] split = s.split("-"); + if(split[0].equals("成功")){ + if(StringUtils.isNotBlank(split[1])){ + EndPrcName endPrcName = new EndPrcName(); + Map objectObjectMap = new HashMap<>(); + objectObjectMap.put("ids",split[1]); + objectObjectMap.put("prcCreateUser","xxx"); + String s1 = JSONObject.toJSONString(objectObjectMap); + endPrcName.setIds(s1); + endPrcName.setIsNot("1"); + return Result.success(endPrcName); + } + return Result.success(); }else { return Result.error(); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java new file mode 100644 index 00000000..363d6b3c --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java @@ -0,0 +1,9 @@ +package com.adc.da.workFlow.entity; + +import lombok.Data; + +@Data +public class EndPrcName { + private String ids; + private String isNot; +}