From 7c9e1e552d171b96e8ec890ba0df5f7abbde1c7d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 24 九月 2024 15:49:00 +0800
Subject: [PATCH] 优化代码 条件获取流浪控制器接口结果排序优化

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index bb6d416..65bb9e1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -325,6 +325,16 @@
       <if test = "address != null and address !=''">
         AND cli.address like CONCAT('%',#{address},'%')
       </if>
+
+      <if test = "villageId != null and villageId !=''">
+        AND cli.villageId =  #{villageId}
+      </if>
+      <if test = "blockId != null and blockId !=''">
+        AND cli.blockId =  #{blockId}
+      </if>
+      <if test = "divideId != null and divideId !=''">
+        AND cli.divideId =  #{divideId}
+      </if>
     </where>
 
   </select>
@@ -343,7 +353,7 @@
         blo.name AS blockName,
         CAST(cli.divideId AS char) AS divideId,
         divi.name AS divideName,
-        CAST(cli.typeId AS char) AS waterTypeId,
+        CAST(cli.typeId AS char) AS typeId,
         wat.typeName AS waterTypeName,
         CAST(cli.id AS char) AS clientId,
         cli.name,
@@ -351,7 +361,7 @@
         cli.phone,
         cli.idCard,
         cli.area,
-        (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id) AS cardCount,
+        (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id)+(SELECT COUNT(*) FROM se_virtual_card WHERE client_id = cli.id) AS cardCount,
         cli.address,
         cli.remarks,
         cli.operateDt
@@ -380,6 +390,16 @@
       <if test = "address != null and address !=''">
         AND cli.address like CONCAT('%',#{address},'%')
       </if>
+
+      <if test = "villageId != null and villageId !=''">
+        AND cli.villageId =  #{villageId}
+      </if>
+      <if test = "blockId != null and blockId !=''">
+        AND cli.blockId =  #{blockId}
+      </if>
+      <if test = "divideId != null and divideId !=''">
+        AND cli.divideId =  #{divideId}
+      </if>
     </where>
     ORDER BY cli.operateDt DESC
     <trim prefix="limit " >
@@ -396,7 +416,7 @@
 
   <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤-->
   <select id="getAreaCodeById" resultType="java.lang.Long">
-    SELECT districtNum FROM se_client WHERE id = ${clientId}
+    SELECT districtNum FROM se_client WHERE id = #{clientId}
   </select>
 
   <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
@@ -431,7 +451,7 @@
 
   <!--鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃-->
   <select id="getWaterTypes" resultType="java.util.Map">
-    SELECT id, typeName from se_water_type
+    SELECT CAST(se_water_type.id AS char) AS id, typeName from se_water_type
   </select>
 
   <!--鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤-->

--
Gitblit v1.8.0