From a30be18fa7896e36943462aef9e9949f0acf7f5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 14:34:45 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
index f84a50d..941c01e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
@@ -164,9 +164,9 @@
SELECT
COUNT(*) AS recordCount
FROM se_active_card act
- INNER JOIN ba_client cli ON act.clientNum = cli.num
- INNER JOIN se_client_card card ON act.cardNum = card.cardNum
- , (SELECT @i:=0) AS itable
+ INNER JOIN ba_client cli ON act.clientNum = cli.num
+ INNER JOIN se_client_card card ON act.cardNum = card.cardNum
+ , (SELECT @i:=0) AS itable
<where>
<if test = "operateType != null and operateType > 0">
AND act.operateType = ${operateType}
@@ -175,10 +175,6 @@
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
-
- <!-- <if test = "cardAddr != null and cardAddr !=''">-->
- <!-- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
- <!-- </if>-->
<if test = "cardNum != null and cardNum !=''">
AND card.cardNum like CONCAT('%',#{cardNum},'%')
@@ -199,13 +195,13 @@
SELECT
(@i:=@i+1) AS id,
cli.`name` AS clientName,
- cli.id AS clientId,
- card.cardAddr,
+ cli.num AS clientNum,
+ card.cardNum,
card.state,
(CASE
- WHEN card.state = 1 THEN "姝ｅ父"
- WHEN card.state = 2 THEN "宸叉敞閿�"
- ELSE "宸叉寕澶�"
+ WHEN card.state = 1 THEN "姝ｅ父"
+ WHEN card.state = 2 THEN "宸叉敞閿�"
+ ELSE "宸叉寕澶�"
END) AS stateName,
act.reissueAmount,
act.cardCost,
@@ -224,10 +220,6 @@
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
-
-<!-- <if test = "cardAddr != null and cardAddr !=''">-->
-<!-- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
-<!-- </if>-->
<if test = "cardNum != null and cardNum !=''">
AND card.cardNum like CONCAT('%',#{cardNum},'%')
--
Gitblit v1.8.0