From e0918cf94acdf4affcad0e3818e86bdb036b3154 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 15 Nov 2023 15:11:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarMenuStandardNewController.java         |  5 +-
 .../entity/StandSystemDTO.java                | 11 +++-
 .../service/ISarMenuStandardNewService.java   |  2 +-
 .../SarMenuStandardNewServiceNewImpl.java     | 26 ++++++++-
 .../SarBussionessStandMapper.xml              | 56 +++++++++++++++++--
 5 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
index 447b82e1..f9899042 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
@@ -32,7 +32,7 @@ import java.util.List;
 @RestController
 @Api(tags = "福田标准法规--标准法规库-菜单标准体系")
 @RequestMapping("/${restPath}/lawss/sarMenuStandardLimit")
-public class SarMenuStandardNewController extends BaseController<StandSystemDTO> {
+public class SarMenuStandardNewController extends BaseController<SarMenuStandardNew> {
 
     @Autowired
     private ISarMenuStandardNewService iSarMenuStandardNewService;
@@ -102,8 +102,7 @@ public class SarMenuStandardNewController extends BaseController<StandSystemDTO>
     @ApiOperation("法规弹窗列表")
     @PostMapping("/standardSystemList")
     public ResponseMessage<?> standardSystemList(@RequestBody StandSystemDTO standSystemDTO) {
-        List<StandSystemDTO> standSystemDTOS = iSarMenuStandardNewService.standardSystemList(standSystemDTO);
-        return Result.success(getPageInfo(standSystemDTO.getPager(), standSystemDTOS));
+        return Result.success(iSarMenuStandardNewService.standardSystemList(standSystemDTO));
     }
 
     @ApiOperation("法规列表弹窗Excel导出")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
index 40fb30bd..67c9f471 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
@@ -10,6 +10,8 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
@@ -18,12 +20,11 @@ import java.util.List;
  * @author: Mzaxd
  * @Date: 2023/11/14 17:20
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
-public class StandSystemDTO extends BasePage {
+public class StandSystemDTO {
 
     @ApiModelProperty(value = "节点Id")
     private String menuId;
@@ -91,6 +92,12 @@ public class StandSystemDTO extends BasePage {
 
     private List<String> selectIdList;
 
+    @NotNull(message = "页码不能为空")
+    private int page;
+
+    @NotEmpty(message = "每页条数不能为空")
+    private int pageSize;
+
     public void setSelectIds(String selectIds) {
         this.selectIds = selectIds;
         this.selectIdList = java.util.Arrays.asList(selectIds.split(","));
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
index 67c74d9a..f6b9f7ee 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
@@ -35,7 +35,7 @@ public interface ISarMenuStandardNewService extends IService<SarMenuStandardNew>
 
     List<SarMenuStandard> standardSystemTree();
 
-    List<StandSystemDTO> standardSystemList(StandSystemDTO standSystemDTO);
+    IPage<List<StandSystemDTO>> standardSystemList(StandSystemDTO standSystemDTO);
 
     void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index 42b85671..f875f7ea 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -177,7 +178,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
     }
 
     @Override
-    public List<StandSystemDTO> standardSystemList(StandSystemDTO standSystemDTO) {
+    public IPage<List<StandSystemDTO>> standardSystemList(StandSystemDTO standSystemDTO) {
         String menuId = standSystemDTO.getMenuId();
         // 校验menuId不能为空
         if (StringUtils.isBlank(menuId)) {
@@ -200,8 +201,27 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         // 按照标准体系排序
         // 体系内部按照国内/海外/企业排序
         // 每个类别的标准内部按照搜索中心设定的类别排序
-        standSystemDTO.getPager().setRowCount(resultList.size());
-        return resultList;
+        // 假设 pageNum 和 pageSize 都是从1开始的
+        Integer pageNum = standSystemDTO.getPage();
+        Integer pageSize = standSystemDTO.getPageSize();
+
+        // 计算总页数
+        int total = resultList.size();
+        int totalPages = (total + pageSize - 1) / pageSize;
+
+        // 计算当前页应该显示的数据的起始和结束索引
+        int start = (pageNum - 1) * pageSize;
+        int end = Math.min(start + pageSize, total);
+
+        // 获取当前页面的数据
+        List<StandSystemDTO> pageList = resultList.subList(start, end);
+
+        // 使用MyBatis Plus的Page类来构造分页对象
+        Page<List<StandSystemDTO>> page = new Page<>(pageNum, pageSize, total);
+        page.setRecords(Collections.singletonList(pageList)); // 设置当前页面的记录
+        page.setTotal(total); // 设置总记录数
+        page.setPages(totalPages); // 设置总页数
+        return page;
     }
 
     @Override
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index 2fd0df3e..ccf86224 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -1268,9 +1268,57 @@
     </update>
 
     <select id="getESSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
-
-
-
-
+        SELECT
+            es.ID AS standId,
+            es.STAND_NUMBER AS standNo,
+            es.STAND_NAME AS standName,
+            es.STAND_STATE AS standState,
+            es.ISSUE_TIME AS releaseDate,
+            es.PUT_TIME AS implementDate,
+            es.REPLACE_STAND_NUM AS replaceStandardNo,
+            esa.QCDW AS dept,
+            esa.WSSMR AS draftUserName,
+        FROM
+        `sar_bussioness_stand` AS es
+        LEFT JOIN `sar_buss_stand_attr_info` AS esa ON es.ID = esa.STAND_ID
+        WHERE gb.STAND_TYPE = 'INLAND'
+            <!--标准编号-->
+            <if test="param.standNo != null and param.standNo != ''">
+                AND gb.STAND_NUMBER LIKE CONCAT('%',#{param.standNo},'%')
+            </if>
+            <!--标准名称-->
+            <if test="param.standName != null and param.standName != ''">
+                AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
+            </if>
+            <!--发布时间-->
+            <if test="param.startReleaseDate != null and param.endReleaseDate != null">
+                AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate}
+            </if>
+            <!--实施日期-->
+            <if test="param.startImplementDate != null and param.endImplementDate != null">
+                AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate}
+            </if>
+            <!--代替标准-->
+            <if test="param.replaceStandardNo != null and param.replaceStandardNo != null">
+                AND gb.REPLACE_STAND_NUM LIKE CONCAT('%',#{param.replaceStandardNo},'%')
+            </if>
+            <!--编制单位-->
+            <if test="param.dept != null and param.dept != null">
+                AND gba.QCDW LIKE CONCAT('%',#{param.dept},'%')
+            </if>
+            <!--起草人-->
+            <if test="param.draftUserName != null and param.draftUserName != null">
+                AND gba.WSSMR LIKE CONCAT('%',#{param.draftUserName},'%')
+            </if>
+            <!--数据来源-->
+            <if test="param.dataSource != null and param.dataSource != null">
+                AND gb.STAND_TYPE = #{dataSource}
+            </if>
+            <if test="param.selectIdList != null and param.selectIdList.size() > 0">
+                AND gb.ID IN
+                <foreach item="item" index="index" collection="param.selectIdList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
     </select>
 </mapper>