From 76686f95b8d3813535e5fce4951ab58cca6978e9 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 18 Jul 2022 17:44:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20=E6=96=B0=E5=A2=9E=20=E4=B8=8B=E6=8B=89=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 30 +++++++++++++++++ .../SarStandProjectLibraryService.java | 2 ++ .../SarStandProjectLibraryServiceImpl.java | 32 +++++++++++++++++++ 3 files changed, 64 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 77a5c481..1abb263f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -125,6 +125,36 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManagerXL(current,pageSize, standDTO); + // 创建一个新的list集合，用于存储去重后的元素 + List listTemp = new ArrayList(); + for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){ + productLineDto p = new productLineDto(); + p.setProductLine(sarStandProjectLibrary.getProductLine()); + List list2 = sarStandProjectLibraryService.queryByProductLineXL(sarStandProjectLibrary.getProductLine()); + p.setSarStandProjectLibraries(list2); + listTemp.add(p); + } + IPage pageres=new Page<>(); + pageres.setRecords(listTemp); + pageres.setPages(list1.getPages()); + pageres.setTotal(list1.getTotal()); + pageres.setCurrent(list1.getCurrent()); + pageres.setSize(list1.getSize()); + return Result.success("200",pageres); + } + @GetMapping("/queryProjectUnderLine") @ApiOperation("查询产品线项目经理") public ResponseMessage queryProjectUnderLine(@RequestParam(defaultValue = "1", value = "current")int current, diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 84f5436d..c9f697d1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -19,7 +19,9 @@ public interface SarStandProjectLibraryService { Map solostar(); List queryById(String id); IPage queryProjectManager(int current, int pageSize, standDTO standDTO); + IPage queryProjectManagerXL(int current, int pageSize, standDTO standDTO); List queryByProductLine(String productLine); + List queryByProductLineXL(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId, String cars); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 856b3a7a..6b899a2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -332,6 +332,29 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManagerXL(int current, int pageSize, standDTO standDTO) { + StringBuilder stringBuilder=new StringBuilder(); + stringBuilder.append("where 1=1 "); + if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){ + stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' "); + } + if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){ + stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' "); + } + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("distinct product_line"); + wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" + + " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString()); + Page page = new Page<>(current, pageSize); + IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } + @Override public List queryByProductLine(String productLine) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -339,6 +362,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper); return list; } + + @Override + public List queryByProductLineXL(String productLine) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("distinct project_number,project_name"); + wrapper.eq("product_line",productLine); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } @Override public List queryStandId(String standId) { QueryWrapper wrapper = new QueryWrapper<>();