From 1b1389f2369b93c26d58f32406f447e2f2aef53e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 12 May 2023 13:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2bu?= =?UTF-8?q?g=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20=E5=8D=B3=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 49 ++++++++++++++++--- 1 file changed, 41 insertions(+), 8 deletions(-) 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 5d702a58..d686b676 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 @@ -1328,18 +1328,51 @@ public class WorkFlowController extends BaseController { @ApiOperation(value = "福企标制修订计划流程变更 在合并 延期 取消 更名 流程变更 批准则结束") @GetMapping("/endPrcName") - public String endPrcName(String sort,String prcName,String json){ - if(StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)){ - return "失败,参数为空."; - }else { - prcName = sort+"-"+prcName+"-计划立项"; + public ResponseMessage endPrcName(String sort,String prcName,String json){ + String s = ""; + if (StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)) { + return Result.error("参数为空"); + } else { + prcName = sort + "-" + prcName + "-计划立项"; } JSONObject jsonObject = JSON.parseObject(json); String esId = jsonObject.getString("esId"); - if(StringUtils.isBlank(esId)){ - return "失败,参数为空."; + String esId1 = jsonObject.getString("esId1"); + if (StringUtils.isBlank(esId) && StringUtils.isBlank(esId1)) { + return Result.error("参数为空"); } - return workFlowFeignClient.endPrcName(prcName,esId); + if(StringUtils.isNotBlank(esId1)){ + String esName1 = jsonObject.getString("esName1"); + String bussSort1 = jsonObject.getString("bussSort1"); + String esId2 = jsonObject.getString("esId2"); + String esName2 = jsonObject.getString("esName2"); + String bussSort2 = jsonObject.getString("bussSort2"); + if(StringUtils.isNotBlank(esId1) && StringUtils.isNotBlank(esName1) && StringUtils.isNotBlank(bussSort1) + && StringUtils.isNotBlank(esId2) && StringUtils.isNotBlank(esName2) && StringUtils.isNotBlank(bussSort2) + ){ + String prcName1 = bussSort1 + "-" + esName1 + "-计划立项"; + String prcName2 = bussSort2 + "-" + esName2 + "-计划立项"; + String s1 = workFlowFeignClient.endPrcName(prcName1, esId1); + String s2 = workFlowFeignClient.endPrcName(prcName2, esId2); + if(s1.equals("成功") && s2.equals("成功")){ + return Result.success(); + }else { + return Result.error(); + } + } + }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); + }else { + return Result.error(); + } + } + return Result.success(); } }