From 55a47c6973b90e4d235067302167b180e971da80 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 12 Jul 2021 17:30:40 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0ProjectManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 11 ++--------- .../dao/SarStandProjectLibraryDao.java | 2 +- .../entity/productLineDto.java | 2 ++ .../impl/SarStandProjectLibraryServiceImpl.java | 13 +++++++------ .../SarStandProjectLibraryMapper.xml | 16 ++++++++-------- 5 files changed, 20 insertions(+), 24 deletions(-) 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 deebf41d..461fd1da 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 @@ -72,7 +72,6 @@ public class SarStandProjectLibraryController extends BaseController list2 = sarStandProjectLibraryService.queryByProductLine(sarStandProjectLibrary.getProductLine()); p.setSarStandProjectLibraries(list2); listTemp.add(p); } - IPage iPage = new Page<>(); - iPage.setRecords(listTemp); - iPage.setCurrent(list1.getCurrent()); - iPage.setSize(list1.getSize()); - iPage.setTotal(list1.getTotal()); - iPage.setPages(list1.getPages()); - - return Result.success("200",iPage); + return Result.success("200",listTemp); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index df0262b0..e8a6ce92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -16,6 +16,6 @@ import java.util.List; * @since 2021-06-15 */ public interface SarStandProjectLibraryDao extends BaseMapper { - List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); +// List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java index ed59c174..f5f47d70 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java @@ -11,5 +11,7 @@ public class productLineDto { private String productLine; + private String projectManager; + private List sarStandProjectLibraries; } 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 5408a66e..f14b36b1 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 @@ -4,7 +4,6 @@ import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlPr import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; -import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -128,11 +127,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.groupBy("product_line"); - IPage list = sarStandProjectLibraryDao.selectPage(new Page<>(current,pageSize),wrapper); - List libraryIPage=sarStandProjectLibraryDao.queryProjectManagerPage((current-1)*pageSize,current*pageSize); - list.setRecords(libraryIPage); - return list; + wrapper.select("product_line","project_manager","uName"); + wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid group by sar_stand_project_library.product_line"); + 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 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 7102efbc..4904402c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -3,12 +3,12 @@ - + + + + + + + +