From 7cf7acab8660fe629056df3ed7c0f90dc2dcb1f8 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 09 七月 2024 17:13:14 +0800
Subject: [PATCH] 灌溉单元新增取水口ID字段，并修改相应的代码和接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 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 e3164a4..35e5a3c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -53,22 +53,31 @@
<!--鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿-->
<select id="getCardIdAndClientNum" resultType="java.util.Map">
-<!-- SELECT id AS cardId, clientNum FROM se_client_card WHERE cardNum = #{cardNum}-->
+ <!-- SELECT id AS cardId, clientNum FROM se_client_card WHERE cardNum = #{cardNum}-->
SELECT
- card.id AS cardId,
- cli.clientNum,
- cli.id AS clientId
+ card.id AS cardId,
+ cli.clientNum,
+ cli.id AS clientId
FROM se_client_card card
- INNER JOIN se_client cli ON card.clientId = cli.id
+ INNER JOIN se_client cli ON card.clientId = cli.id
WHERE card.cardNum = #{cardNum}
</select>
+ <!-- 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱瀵瑰簲鐨勫啘鎴穒d鍜屽鍚� -->
+ <select id="getClientIdAndNameByCardAddrAndCardNo" resultType="java.util.Map">
+ SELECT
+ cli.id AS clientId,
+ cli.name AS clientName
+ FROM se_client_card card
+ INNER JOIN se_client cli ON card.clientId = cli.id
+ WHERE card.cardAddr = #{cardAddr} and card.cardNum = #{cardNum}
+ </select>
<!--鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈡按鍗＄紪鍙�-->
<select id="getCardNumOfMax" resultType="java.lang.String">
SELECT cardNum
FROM se_client_card
- WHERE cardNum LIKE CONCAT('%',#{areaCode},'%')
+ WHERE cardNum LIKE CONCAT(#{areaCode},'%')
ORDER BY cardNum desc
LIMIT 0,1
</select>
@@ -344,8 +353,9 @@
SELECT
COUNT(*) AS recordCount
FROM se_client_card card
- INNER JOIN se_client cli ON card.clientId = cli.id
+ 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>
@@ -365,20 +375,26 @@
SELECT
cli.clientNum,
cli.name AS clientName,
- card.cardNum,
+ 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 '姝ｅ父'
- WHEN card.state = 2 THEN '宸叉敞閿�'
- WHEN card.state = 3 THEN '宸叉寕澶�'
- End) AS stateName,
+<!-- (CASE-->
+<!-- WHEN card.state = 1 THEN '姝ｅ父'-->
+<!-- WHEN card.state = 2 THEN '宸叉敞閿�'-->
+<!-- WHEN card.state = 3 THEN '宸叉寕澶�'-->
+<!-- End) AS stateName,-->
+ '姝ｅ父' 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>
@@ -413,20 +429,20 @@
SELECT
cli.clientNum,
cli.name AS clientName,
- card.cardNum,
+ 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 '姝ｅ父'
- WHEN card.state = 2 THEN '宸叉敞閿�'
- WHEN card.state = 3 THEN '宸叉寕澶�'
- End) AS stateName,
+ '宸叉寕澶�' 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 card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.cardNum)
+ WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.id)
ORDER BY card.id
<trim prefix="limit " >
<if test="start != null and count != null">
--
Gitblit v1.8.0