From eef1bac64a0080f8f609312e31f63280b85e62d6 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 26 一月 2024 20:26:12 +0800
Subject: [PATCH] 2024-01-26 朱宝民 添加获取卡列表接口,应用程序使用

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 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 f96ab0a..aaed05f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
@@ -32,17 +32,19 @@
     delete from se_active_card
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard" useGeneratedKeys="true">
+
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard">
     <!--@mbg.generated-->
-    insert into se_active_card (cardId, clientId, cardCost, 
+    insert into se_active_card (id, cardId, clientId, cardCost,
       paymentId, reissueAmount, operateType, 
       remarks, `operator`, operateDt
       )
-    values (#{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{cardcost,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{cardcost,jdbcType=INTEGER},
       #{paymentid,jdbcType=BIGINT}, #{reissueamount,jdbcType=DOUBLE}, #{operatetype,jdbcType=TINYINT}, 
       #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
       )
   </insert>
+
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeActiveCard" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into se_active_card
@@ -159,7 +161,7 @@
     SELECT
         COUNT(*) AS recordCount
     FROM se_active_card act
-    INNER JOIN ba_client cli ON act.clientId = cli.id
+    INNER JOIN se_client cli ON act.clientId = cli.id
     INNER JOIN se_client_card card ON act.cardId = card.id
     , (SELECT @i:=0) AS itable
     <where>
@@ -171,8 +173,8 @@
         AND cli.name like CONCAT('%',#{clientName},'%')
       </if>
 
-      <if test = "cardAddr != null and cardAddr !=''">
-        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>
 
       <if test = "state != null and state > 0">
@@ -190,23 +192,23 @@
     SELECT
         (@i:=@i+1) AS id,
         cli.`name` AS clientName,
-        cli.id AS clientId,
-        card.cardAddr,
+        cli.clientNum,
+        card.cardNum,
         card.state,
         (CASE
             WHEN card.state = 1 THEN "姝e父"
             WHEN card.state = 2 THEN "宸叉敞閿�"
             ELSE "宸叉寕澶�"
         END) AS stateName,
-      act.reissueAmount,
-      act.cardCost,
-      act.paymentId,
-      (SELECT `name` FROM ba_user WHERE id =  act.operator) AS operator,
-      act.operateDt
+        act.reissueAmount,
+        act.cardCost,
+        act.paymentId,
+        (SELECT `name` FROM ba_user WHERE id =  act.operator) AS operator,
+        act.operateDt
     FROM se_active_card act
-      INNER JOIN ba_client cli ON act.clientId = cli.id
-      INNER JOIN se_client_card card ON act.cardId = card.id
-      , (SELECT @i:=0) AS itable
+        INNER JOIN se_client cli ON act.clientId = cli.id
+        INNER JOIN se_client_card card ON act.cardId = card.id
+        , (SELECT @i:=0) AS itable
     <where>
       <if test = "operateType != null and operateType > 0">
         AND act.operateType = ${operateType}
@@ -216,8 +218,8 @@
         AND cli.name like CONCAT('%',#{clientName},'%')
       </if>
 
-      <if test = "cardAddr != null and cardAddr !=''">
-        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>
 
       <if test = "state != null and state > 0">
@@ -228,7 +230,7 @@
         AND act.operateDt BETWEEN #{activeTimeStart} AND #{activeTimeStop}
       </if>
     </where>
-
+    ORDER BY act.operateDt DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${pageCurr}, ${pageSize}
     </if>

--
Gitblit v1.8.0