From e10c9e150cef3096b295e6d9a3160862f4f0128d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 26 八月 2024 15:26:45 +0800
Subject: [PATCH] 修改农户分页查询接口和查一个农户的所有卡接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 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 1bdeb43..bd1b81a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -321,19 +321,37 @@
     set money = #{money,jdbcType=FLOAT}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <!--鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃-->
+  <!--鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級-->
   <select id="getCardInfoByClientId" resultType="com.dy.pipIrrGlobal.voSe.VoCardInfo">
     SELECT
-        cardNum,
-        '鐢ㄦ埛鍗�' AS cardType,
-        money,
-        (CASE
-            WHEN state = 1 THEN '姝e父'
-            WHEN state = 2 THEN '宸叉敞閿�'
-            ELSE '宸叉寕澶�'
-        END) AS state
-    FROM se_client_card
-    WHERE clientId = #{clientId,jdbcType=BIGINT}
+    *
+    FROM
+    (SELECT
+    '鐗╃悊鍗�' AS cardType,
+    clientCard.cardNum   AS CardNum,
+    clientCard.money   AS Money,
+    (CASE
+    WHEN clientCard.state = 1 THEN '姝e父'
+    WHEN clientCard.state = 2 THEN '宸叉敞閿�'
+    ELSE '宸叉寕澶�'
+    END) AS State
+    FROM se_client client
+    LEFT JOIN se_client_card clientCard ON clientCard.clientId = client.id
+    WHERE client.id = #{clientId,jdbcType=BIGINT}
+    UNION ALL
+    SELECT
+    '铏氭嫙鍗�' AS cardType,
+    virtualCard.vc_num   AS CardNum,
+    virtualCard.money   AS vcMoney,
+    (CASE
+    WHEN virtualCard.in_use = 0 THEN '鏈娇鐢�'
+    WHEN virtualCard.in_use = 1 THEN '浣跨敤涓�'
+    END) AS State
+    FROM se_client client
+    LEFT JOIN se_virtual_card virtualCard ON client.id = virtualCard.client_id
+    WHERE client.id = #{clientId,jdbcType=BIGINT}
+    ) card
+    ORDER BY card.Money DESC , card.State DESC
   </select>
 
   <!--鏍规嵁姘村崱缂栧彿鑾峰彇鎿嶄綔璁板綍鍒楄〃-->

--
Gitblit v1.8.0