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 39cb0fb4..dc21c5e1 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,20 +72,19 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManager(); + public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize){ + List list1 = sarStandProjectLibraryService.queryProjectManager((current-1)*pageSize,pageSize); // 创建一个新的list集合,用于存储去重后的元素 List listTemp = new ArrayList(); for (SarStandProjectLibrary sarStandProjectLibrary:list1){ productLineDto p = new productLineDto(); p.setProductLine(sarStandProjectLibrary.getProductLine()); - p.setProjectManager(sarStandProjectLibrary.getProjectManager()); + p.setUName(sarStandProjectLibrary.getUName()); List list2 = sarStandProjectLibraryService.queryByProductLine(sarStandProjectLibrary.getProductLine()); p.setSarStandProjectLibraries(list2); listTemp.add(p); } System.out.println(listTemp); - 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 fae67684..f55bb29b 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 @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** *

* Mapper 接口 @@ -12,5 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2021-06-15 */ public interface SarStandProjectLibraryDao extends BaseMapper { + List queryProjectManager(int current, int pageSize); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index d4e8b803..6f0e9dd2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.entity; import com.adc.da.base.entity.BaseEntity; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -63,7 +64,12 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "产品线") private String productLine; + @ApiModelProperty(value = "项目经理") private String projectManager; + @ApiModelProperty(value = "项目经理名称") + @TableField(exist = false) + private String uName; + } 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 11a2aed8..ed59c174 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 @@ -7,7 +7,7 @@ import java.util.List; @Data public class productLineDto { - private String projectManager; + private String uName; private String productLine; 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 8e9dcb06..1b095af9 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 @@ -11,6 +11,6 @@ public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); List queryById(String id); - List queryProjectManager(); + List queryProjectManager(int current, int pageSize); List queryByProductLine(String productLine); } 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 04dfe995..371b7190 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 @@ -42,7 +42,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager() { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("product_line","project_manager"); - wrapper.groupBy("product_line"); - List list = sarStandProjectLibraryDao.selectList(wrapper); + public List queryProjectManager(int current, int pageSize) { +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.select("product_line","project_manager"); +// wrapper.groupBy("product_line"); + List list = sarStandProjectLibraryDao.queryProjectManager(current,pageSize); return list; } 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 d5caed43..f876c103 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 @@ -2,4 +2,13 @@ + +