From 3f5515b77b7cd1aa57442c77425254df5308b705 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 29 Sep 2022 16:56:13 +0800
Subject: [PATCH] =?UTF-8?q?sql=20=E4=B8=8D=E6=83=B3=E5=88=A0=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E4=BF=9D=E7=95=99=EF=BC=8C=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AA=E6=98=AF=E5=89=8D=E7=AB=AFbug=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E9=9C=80=E5=8E=BB=E6=8E=89control=E5=B1=82=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ndardComplianceAssessResultController.java |  6 ++--
 ...SarStandardComplianceProductAssessDao.java |  4 +++
 ...rStandardComplianceProductAssessMapper.xml | 34 +++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
index 42640ba1..680d71df 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
@@ -50,9 +50,9 @@ public class SarStandardComplianceAssessResultController {
     @ApiOperation(value = "条件查询标准清单")
     @GetMapping("/standard")
     public ResponseMessage<Object> selectStandard(SarStandardsInfoEO eo) throws Exception {
-        if(StringUtils.isNotBlank(eo.getStandNumber())){
-            eo.setStandNumber(eo.getStandNumber().replace("  ","  "));
-        }
+//        if(StringUtils.isNotBlank(eo.getStandNumber())){
+//            eo.setStandNumber(eo.getStandNumber().replace("  ","  "));
+//        }
         if (eo.getStandApplicationType() == 1) {
             QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
             IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
index 6cf6e1b8..880f782d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
@@ -24,4 +24,8 @@ public interface SarStandardComplianceProductAssessDao extends BaseMapper<SarSta
 
     List<Integer> selectPagesCount(@Param("product")unCountDTO productAssess);
 
+    List<SarStandardComplianceProductAssess> selectByPages(@Param("page")Long page,@Param("pageSize")Long size,@Param("product") SarStandardComplianceProductAssess productAssess);
+
+    List<Integer> selectByPagesCount(@Param("product")SarStandardComplianceProductAssess productAssess);
+
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
index a40576d8..894b5c40 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
@@ -88,4 +88,38 @@
         ORDER BY
         sar_stand_project_library.project_name ASC
     </select>
+
+    <select id="selectByPages"
+            resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess">
+        SELECT
+            STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE
+        FROM sar_standard_compliance_product_assess
+        WHERE 1=1
+        <if test="null != product.standNumber and '' != product.standNumber">
+            and REPLACE(STAND_NUMBER,'  ',' ') like CONCAT('%',#{product.standNumber},'%')
+        </if>
+        <if test="null != product.standName and '' != product.standName">
+            and STAND_NAME like CONCAT('%',#{product.standName},'%')
+        </if>
+        <if test="null != product.type and '' != product.type">
+            and type like CONCAT('%',#{product.type},'%')
+        </if>
+        limit ${(page-1)*pageSize},${pageSize}
+    </select>
+
+    <select id="selectByPagesCount" resultType="java.lang.Integer">
+        SELECT
+        STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE
+        FROM sar_standard_compliance_product_assess
+        WHERE 1=1
+        <if test="null != product.standNumber and '' != product.standNumber">
+            and standNumber like CONCAT('%',#{product.standNumber},'%')
+        </if>
+        <if test="null != product.standName and '' != product.standName">
+            and standName like CONCAT('%',#{product.standName},'%')
+        </if>
+        <if test="null != product.type and '' != product.type">
+            and type like CONCAT('%',#{product.type},'%')
+        </if>
+    </select>
 </mapper>