From 97ebfb6f6a41ae79d6ce4d185d474be7a8f7226c Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 16 Sep 2021 14:56:39 +0800 Subject: [PATCH 1/3] feat: There is no way the --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 5 +++++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 ++++++ 3 files changed, 14 insertions(+) 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 343b921d..5c8cf3cd 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 @@ -17,6 +17,9 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) + long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId); + @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) Wrapper activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId); 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 2b40fb5e..aa8221bc 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 @@ -25,6 +25,11 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ + long stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId); + return stringWrapper; + } + public ResponseMessage activiti_define_start(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId){ Wrapper stringWrapper = workFlowFeignClient.activiti_define_start(Id,userId,bpnId); return Result.success(stringWrapper.getResult()); 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 34216ab8..523b81e8 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 @@ -51,6 +51,12 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "流程实例明细验证是否完成") + @GetMapping("/get_verify_by_instance") + public long activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ + return workFlowFeignClient.get_verify_by_instance(taskId,pId); + } + @ApiOperation(value = "导出excel") @PostMapping("/export_excel") public void exportExcel(@RequestBody ExportExcelEO exportExcelEO, HttpServletResponse response, HttpServletRequest request) throws IOException { From 6e88f37c28f9874bc189bfde162adfd431e702c5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Sep 2021 15:00:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/SarPublicIdeaServiceImpl.java | 3 +- .../impl/SarStandItemsServiceImpl.java | 33 +++++++++++++++++-- .../SarStandItems/SarStandItemsMapper.xml | 1 + 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 9c2466f9..f5c6e163 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -55,8 +55,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl page = new Page<>(p, size); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index a0fbafa7..cc30e365 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -19,8 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; /** *

@@ -193,7 +192,35 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ - return dao.selectAllItemsByIds(type,ids); + List list=dao.selectAllItemsByIds(type,ids); + List res=new ArrayList<>(); + if (null == list || list.isEmpty()){ + return list; + }else { + List integerList=new ArrayList<>(); + Map> map=new HashMap<>(); + list.forEach(sarStandItemsDto -> { + int a= sarStandItemsDto.getItemsNum().indexOf("."); + String mark=sarStandItemsDto.getItemsNum(); + if (a>0){ + mark=mark.substring(0,a); + } + if (null != map.get(Integer.valueOf(mark))){ + map.get(Integer.valueOf(mark)).add(sarStandItemsDto); + }else { + integerList.add(Integer.valueOf(mark)); + List middle=new ArrayList<>(); + middle.add(sarStandItemsDto); + map.put(Integer.valueOf(mark),middle); + } + }); + Collections.sort(integerList); + integerList.forEach(integer -> { + res.addAll(map.get(integer)); + }); + + return res; + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 0482c52c..64aa146f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -742,6 +742,7 @@ #{item} + order by ITEMS_NUM