From c34ac741772cf82d6e5e3e20796118ecebd39d6a Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Fri, 29 Dec 2023 15:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E8=AF=86=E6=A0=87=E7=89=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/kms/TianhuiApplication.java |  2 +-
 .../com/kms/yg/sz/domain/BsSgcSzBzbp.java     |  5 +++
 .../kms/yg/sz/mapper/BsSgcSzBzbpMapper.java   |  4 +++
 .../kms/yg/sz/service/BsSgcSzBzbpService.java | 12 +++++--
 .../mapper/yg/sz/BsSgcSzBzbpMapper.xml        | 32 +++++++++++++++++++
 5 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml

diff --git a/shuili-admin/src/main/java/com/kms/TianhuiApplication.java b/shuili-admin/src/main/java/com/kms/TianhuiApplication.java
index 39d7a808..3eaedee9 100644
--- a/shuili-admin/src/main/java/com/kms/TianhuiApplication.java
+++ b/shuili-admin/src/main/java/com/kms/TianhuiApplication.java
@@ -16,7 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @ComponentScan(basePackages = {"com.shuili.*","com.kms.*"})
-@MapperScan("com.shuili.*")
+@MapperScan(basePackages = {"com.shuili.*","com.kms.*"})
 public class TianhuiApplication
 {
 	public static void main(String[] args)  {
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java
index 3406d6a0..b5cb3dbf 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java
@@ -1,5 +1,6 @@
 package com.kms.yg.sz.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -87,4 +88,8 @@ public class BsSgcSzBzbp extends BaseEntity
 
     private String sluiceName;
 
+
+    @TableField(exist = false)
+    private String number;
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
index 79c4a283..69f5271a 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
@@ -1,9 +1,12 @@
 package com.kms.yg.sz.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yg.sz.domain.BsSgcSzBzbp;
 
+import java.util.List;
+
 /**
  * 水闸标识标牌Mapper接口
  *
@@ -13,4 +16,5 @@ import com.kms.yg.sz.domain.BsSgcSzBzbp;
 @Repository
 public interface BsSgcSzBzbpMapper extends BaseMapper<BsSgcSzBzbp> {
 
+    List<BsSgcSzBzbp> selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("sluiceName") String sluiceName, @Param("adcd") String adcd);
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
index eabb07fd..b6dc5376 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
@@ -11,6 +11,7 @@ import com.kms.yg.sz.domain.BsSgcSzBzbp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -52,8 +53,15 @@ public class BsSgcSzBzbpService extends BaseService<BsSgcSzBzbpMapper, BsSgcSzBz
 
 
         Page<BsSgcSzBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
-        Page<BsSgcSzBzbp> infoPage = bsSgcSzBzbpMapper.selectPage(page, queryWrapper);
-        return infoPage;
+        List<BsSgcSzBzbp> infoPage = bsSgcSzBzbpMapper.selectList1(sp.getPageNum(),sp.getPageSize(),
+                projectInfo.getSluiceName(),projectInfo.getAdcd());
+
+        Page<BsSgcSzBzbp> bzbpPage = new Page<>();
+
+        bzbpPage.setRecords(infoPage);
+        bzbpPage.setTotal(infoPage.size());
+
+        return bzbpPage;
     }
 
 }
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
new file mode 100644
index 00000000..02de7613
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzBzbpMapper">
+
+
+    <resultMap type="com.kms.yg.sz.domain.BsSgcSzBzbp" id="Result">
+        <id     property="id"     column="id"     />
+        <result property="sluiceName"   column="sluice_name"   />
+        <result property="adcd"   column="adcd"   />
+        <result property="number"   column="number"   />
+
+    </resultMap>
+
+    <select id="selectList1" resultMap="Result">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        SELECT sluice_name, adcd, COUNT(1) number
+        FROM bs_sgc_sz_bzbp
+        <where>
+            <if test="sluiceName != null and sluiceName != ''">
+                sluice_name like concat('%', #{sluiceName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and adcd = #{adcd}
+            </if>
+        </where>
+        GROUP BY sluice_code
+        ORDER BY create_time DESC
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
+</mapper>