From de34688afc76e7da321d672e96a947fafced3726 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 14:54:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=85=E5=8A=9E=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8E=20=E9=A6=96=E9=A1=B5=E5=BE=85=E5=8A=9E=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 5 ++++- .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 5 +++++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 677f46ea..73d35ca2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -85,9 +85,12 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST) Wrapper> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); - @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST) + @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST) + List todoTaskListByUserIdInfo(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 79652be7..1472afb6 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -473,4 +473,9 @@ public class workFlowFeignClientImpl { public String endPrcName(String prcName,String esId) { return workFlowFeignClient.endPrcName(prcName,esId); } + + public List todoTaskListByUserIdInfo(TaskCommonQuery taskCommonQuery) { + List mapWrapper = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery); + return mapWrapper; + } } 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 d686b676..fa6e0c0e 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 @@ -532,7 +532,7 @@ public class WorkFlowController extends BaseController { @ApiOperation(value = "我的待办任务列表") @PostMapping("/todoTaskList") public PageInfo todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) { - List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + List busProcessNames = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery); List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); PageInfo pageInfo = new PageInfo(); if (busProcessNames != null) { From 1352111b2fe995dd0a20327ea0a6a242fe727db9 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 16:27:28 +0800 Subject: [PATCH 2/4] =?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; +} From 57b3f336104b9de3599fad4bc9cb353d281992cc Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 17:27:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E8=B6=8A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/workFlow/controller/WorkFlowController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 bc562920..eadaa447 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 @@ -1365,8 +1365,9 @@ public class WorkFlowController extends BaseController { }else { s = workFlowFeignClient.endPrcName(prcName, esId); String[] split = s.split("-"); + List asList = Arrays.asList(split); if(split[0].equals("成功")){ - if(StringUtils.isNotBlank(split[1])){ + if(asList.size()>1){ EndPrcName endPrcName = new EndPrcName(); Map objectObjectMap = new HashMap<>(); objectObjectMap.put("ids",split[1]); @@ -1376,7 +1377,10 @@ public class WorkFlowController extends BaseController { endPrcName.setIsNot("1"); return Result.success(endPrcName); } - return Result.success(); + EndPrcName endPrcName = new EndPrcName(); + endPrcName.setIsNot("2"); + endPrcName.setIds("xxx"); + return Result.success(endPrcName); }else { return Result.error(); } From d7754c7ca7ab0c2c5d13b8927743b7902a1685e0 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 17:35:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=87=E5=87=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 717910ce..8bd79183 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -3194,21 +3194,21 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ -//// return true; -//// } -// } else { -// sarStandMenuEO.setOldMenuId(secondLevelId); -// List menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); -// sarStandMenuEO.setMenuIds(menuOldIds); -// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); -//// if (size>0) { -//// return true; -//// } -// } + if (getInfo == null || getInfo.isEmpty()) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + int size = sarStandMenuEODao.insert(sarStandMenuEO); + if (size>0){ + return true; + } + } else { + sarStandMenuEO.setOldMenuId(secondLevelId); + List menuOldIdsInfo = sarMenuEOService.getChildMenuList(secondLevelId); + sarStandMenuEO.setMenuIds(menuOldIdsInfo); + int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); + if (size>0) { + return true; + } + } } return true; }