From 5f9f16253565ccdbb230a0a80b7a455fe16ae127 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 21 Jan 2022 14:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandProjectLibraryController.java     | 11 +++--
 .../dao/SarStandProjectLibraryDao.java        |  6 ++-
 .../SarStandProjectLibraryService.java        |  4 +-
 .../SarStandProjectLibraryServiceImpl.java    | 24 ++++++++--
 .../SarStandProjectLibraryMapper.xml          | 44 +++++++++++++++++++
 5 files changed, 77 insertions(+), 12 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 0cd08aa5..e6e77371 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
@@ -346,14 +346,17 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
     //标准评估流程 查询项目群接口
     @GetMapping("/queryProjectGroup")
     @ApiOperation("查询项目群")
-    public ResponseMessage queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary){
-        return Result.success( sarStandProjectLibraryService.queryProjectGroup(sarStandProjectLibrary));
+    public ResponseMessage queryProjectGroup(@RequestParam(defaultValue = "1", value = "current")int current,
+                                             @RequestParam(defaultValue = "10", value = "PageSize") int pageSize,
+                                             SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjectGroup(current,pageSize,sarStandProjectLibrary));
     }
     //标准评估流程根据项目群查项目接口
     @GetMapping("/queryProjects")
     @ApiOperation("查询项目群下的项目")
-    public ResponseMessage queryProjects(SarStandProjectLibrary sarStandProjectLibrary){
-        return Result.success( sarStandProjectLibraryService.queryProjects(sarStandProjectLibrary));
+    public ResponseMessage queryProjects(@RequestParam(defaultValue = "1", value = "current")int current,
+                                         @RequestParam(defaultValue = "10", value = "PageSize") int pageSize,SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjects(current,pageSize,sarStandProjectLibrary));
     }
 
 
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 ca7feae1..1693106b 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
@@ -33,7 +33,9 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         void deleteByProjectId(@Param("projectId")String projectId);
 
         List<String> selectListByids(@Param("ids") List<String> ids);
-        List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+        List<SarStandProjectLibrary> queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+        Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
-        List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
+        List<SarStandProjectLibrary> queryProjects(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
+        Integer queryProjectsCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
 }
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 72f916ab..84f5436d 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
@@ -29,8 +29,8 @@ public interface SarStandProjectLibraryService {
     void batchInsertAdd(@Param("ids") List<StandProjectRelationDto> list);
     List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
     public Head AnalysisJsonAndStorage(String jsonStr);
-    public List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+    public IPage<SarStandProjectLibrary> queryProjectGroup(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
-    public List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+    public IPage<SarStandProjectLibrary> queryProjects(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
 }
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 63c7cddc..87ddfb1c 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
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -129,12 +130,19 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     }
 
     @Override
-    public List<SarStandProjectLibrary> queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) {
-        return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary);
+    public IPage<SarStandProjectLibrary> queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) {
+        List<SarStandProjectLibrary> sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary);
+        Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary);
+        Page<SarStandProjectLibrary> page=new Page<>();
+        page.setRecords(sarStandProjectLibraries);
+        page.setTotal(total);
+        page.setCurrent(current);
+        page.setSize(size);
+        return page;
     }
 
     @Override
-    public List<SarStandProjectLibrary> queryProjects(SarStandProjectLibrary sarStandProjectLibrary) {
+    public IPage<SarStandProjectLibrary> queryProjects(int current,int size, SarStandProjectLibrary sarStandProjectLibrary) {
         List<String> ids=new ArrayList<>();
         if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){
             if (sarStandProjectLibrary.getProjectGroup().contains(",")){
@@ -143,7 +151,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 ids.add(sarStandProjectLibrary.getProjectGroup());
             }
         }
-        return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary,ids);
+        IPage<SarStandProjectLibrary> sarStandProjectLibraryIPage=new Page<>();
+        List<SarStandProjectLibrary> sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjects(current,size,sarStandProjectLibrary,ids);
+        Integer total=sarStandProjectLibraryDao.queryProjectsCount(sarStandProjectLibrary,ids);
+        sarStandProjectLibraryIPage.setTotal(total);
+        sarStandProjectLibraryIPage.setCurrent(current);
+        sarStandProjectLibraryIPage.setSize(size);
+        sarStandProjectLibraryIPage.setRecords(sarStandProjectLibraries);
+
+        return sarStandProjectLibraryIPage;
     }
 
     @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 7350546f..b3c44c53 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
@@ -381,6 +381,24 @@
         <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
           and  sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
         </if>
+        limit  ${(current-1) * size},${size}
+    </select>
+    <select id="queryProjectGroupCount"
+            resultType="java.lang.Integer">
+        select count(a.project_group) from (
+        select distinct
+        sar_stand_project_library.project_group,sar_stand_project_library.management_host_name,sar_stand_project_library.category_name,sar_stand_project_library.development_host_name
+        from sar_stand_project_library
+        where 1=1
+        <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
+            and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
+        </if>
+        <if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
+            and sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
+        </if>
+        <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
+            and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
+        </if> )a
     </select>
     <select id="queryProjects"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
@@ -405,5 +423,31 @@
             #{item}
         </foreach>
         </if>
+        limit  ${(current-1) * size},${size}
+    </select>
+
+    <select id="queryProjectsCount"
+            resultType="java.lang.Integer">
+        select count(sar_stand_project_library.id) from sar_stand_project_library
+        left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
+        where 1=1
+        <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
+            and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
+        </if>
+        <if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
+            and sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
+        </if>
+        <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
+            and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
+        </if>
+        <if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
+            and sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
+        </if>
+        <if test="null != groups and groups.size()>0">
+        and sar_stand_project_library.project_group in
+        <foreach collection="groups" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        </if>
     </select>
 </mapper>