From fdecbc710888e8f048f08ec16428f192b8251dfe Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 08 七月 2024 11:30:54 +0800
Subject: [PATCH] 2024-07-08 朱宝民 优化根据指定条件获取水卡列表接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index 8a2ea9f..c734f5c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -365,20 +365,25 @@
     SELECT
         cli.clientNum,
         cli.name AS clientName,
-        card.cardNum,
+        CASE
+            WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))
+            ELSE card.cardNum
+        END AS cardNum,
         cli.phone,
         cli.idCard,
         card.state AS cardState,
-        (CASE
-            WHEN card.state = 1 THEN '姝e父'
-            WHEN card.state = 2 THEN '宸叉敞閿�'
-            WHEN card.state = 3 THEN '宸叉寕澶�'
-        End) AS stateName,
+<!--        (CASE-->
+<!--            WHEN card.state = 1 THEN '姝e父'-->
+<!--            WHEN card.state = 2 THEN '宸叉敞閿�'-->
+<!--            WHEN card.state = 3 THEN '宸叉寕澶�'-->
+<!--        End) AS stateName,-->
+        '姝e父' AS stateName,
         '鍐滄埛鍗�' AS cardType,
         FORMAT(card.money, 2) AS money
     FROM se_client_card card
         INNER JOIN se_client cli ON card.clientId = cli.id
     <where>
+      AND card.state = 1
       <if test = "clientNum != null and clientNum !=''">
         AND cli.clientNum like CONCAT('%',#{clientNum},'%')
       </if>
@@ -435,12 +440,11 @@
     </trim>
   </select>
 
-  <!--鍒ゆ柇鎸囧畾姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏃犺ˉ鍗¤褰�-->
-  <select id="isLostAndUnreplaced" resultType="java.lang.Integer">
+  <!--鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇鎸傚け浜嬭褰曟暟閲忥紙琛ュ崱銆佽В閿佷娇鐢級-->
+  <select id="getLostCount" resultType="java.lang.Integer">
     SELECT
         COUNT(*) AS recordCount
     FROM se_client_card card
-        INNER JOIN se_client_card card2 ON card2.original_card_id = card.cardNum
     <where>
       AND card.state = 3
       <if test = "cardNum != null and cardNum > 0">
@@ -448,6 +452,19 @@
       </if>
     </where>
   </select>
+
+  <!--鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇宸茶ˉ鍗℃暟閲忥紙琛ュ崱銆佽В閿佷娇鐢級-->
+  <select id="getReplacedCount" resultType="java.lang.Integer">
+    SELECT
+        COUNT(*) AS recordCount
+    FROM se_client_card card
+        INNER JOIN se_client_card card2 ON card2.original_card_id = card.id
+    <where>
+      <if test = "cardNum != null and cardNum > 0">
+        AND card.cardNum = #{cardNum}
+      </if>
+    </where>
+  </select>
   <!--鏍规嵁鍐滄埛濮撳悕鍜屾墜鏈哄彿鑾峰彇姘村崱鍒楄〃璁板綍鏁帮紝搴旂敤绋嬪簭浣跨敤-->
   <select id="getCardsByClientNameAndPhoneCount" resultType="java.lang.Long">
     SELECT

--
Gitblit v1.8.0