From 352487548a14789c2b5d85b278a75b78c687908c Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 11 May 2023 19:07:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=20=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 a75d9553..ffd14a83 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 @@ -583,6 +583,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page, "0"); + if(sarlist.isEmpty()){ + page.setStandName(page.getStandNumber()); + page.setStandNumber(null); + rowCount = dao.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + sarlist = dao.getSarStandardsInfoPage(page, "0"); + } attrInfoCollect(sarlist); return sarlist; } From 1ea4f820da5eb6a8fb3add33e1dc454eeebc6b3b Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 11 May 2023 20:00:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 54f478ce..677f46ea 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,7 +85,7 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST) Wrapper> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); - @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) + @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) From 1b1389f2369b93c26d58f32406f447e2f2aef53e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 12 May 2023 13:14:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2bug=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20=E5=8D=B3?= =?UTF-8?q?=E5=88=A0=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(); } }