From bc45a4a5a9b40e934317644c691ec5117e802859 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 30 一月 2024 11:10:15 +0800
Subject: [PATCH] 2024-01-30 朱宝民 修改服务类分页参数计算部分

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml |  106 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 101 insertions(+), 5 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 6add79a..fbd6120 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -17,14 +17,15 @@
     <result column="cancelDt" jdbcType="TIMESTAMP" property="canceldt" />
     <result column="unlockDt" jdbcType="TIMESTAMP" property="unlockdt" />
     <result column="reversalDt" jdbcType="TIMESTAMP" property="reversaldt" />
+    <result column="refundDt" jdbcType="TIMESTAMP" property="refunddt" />
     <result column="consumeDt" jdbcType="TIMESTAMP" property="consumedt" />
     <result column="lastOper" jdbcType="TINYINT" property="lastoper" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt, 
-    lossDtDt, cancelDt, unlockDt, reversalDt, consumeDt, lastOper, remarks
+    id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt,
+    lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -76,14 +77,14 @@
     insert into se_client_card (id, cardAddr, cardNum, clientId,
       money, `state`, createDt, 
       replaceDt, rechargeDt, lossDtDt, 
-      cancelDt, unlockDt, reversalDt, 
+      cancelDt, unlockDt, reversalDt, refundDt,
       consumeDt, lastOper, remarks
       )
     values (#{id,jdbcType=BIGINT}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT},
       #{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{createdt,jdbcType=TIMESTAMP}, 
       #{replacedt,jdbcType=TIMESTAMP}, #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP}, 
-      #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP}, 
-      #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}
+      #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP},
+      #{refunddt,jdbcType=TIMESTAMP}, #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}
       )
 
   </insert>
@@ -126,6 +127,9 @@
       </if>
       <if test="reversaldt != null">
         reversalDt,
+      </if>
+      <if test="refunddt != null">
+        refundDt,
       </if>
       <if test="consumedt != null">
         consumeDt,
@@ -173,6 +177,9 @@
       </if>
       <if test="reversaldt != null">
         #{reversaldt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refunddt != null">
+        #{refunddt,jdbcType=TIMESTAMP},
       </if>
       <if test="consumedt != null">
         #{consumedt,jdbcType=TIMESTAMP},
@@ -225,6 +232,9 @@
       <if test="reversaldt != null">
         reversalDt = #{reversaldt,jdbcType=TIMESTAMP},
       </if>
+      <if test="refunddt != null">
+        refundDt = #{refunddt,jdbcType=TIMESTAMP},
+      </if>
       <if test="consumedt != null">
         consumeDt = #{consumedt,jdbcType=TIMESTAMP},
       </if>
@@ -252,6 +262,7 @@
       cancelDt = #{canceldt,jdbcType=TIMESTAMP},
       unlockDt = #{unlockdt,jdbcType=TIMESTAMP},
       reversalDt = #{reversaldt,jdbcType=TIMESTAMP},
+      refundDt = #{refunddt,jdbcType=TIMESTAMP},
       consumeDt = #{consumedt,jdbcType=TIMESTAMP},
       lastOper = #{lastoper,jdbcType=TINYINT},
       remarks = #{remarks,jdbcType=VARCHAR}
@@ -291,4 +302,89 @@
         INNER JOIN se_client_card card ON his.cardId = card.id
     WHERE card.cardNum = ${cardNum}
   </select>
+
+  <!--鏍规嵁姘村崱缂栧彿鑾峰彇鍗$墖鐘舵�侊細1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙i攣锛�7-鍐叉锛�8-娑堣垂-->
+  <select id="getCardStateByCardNum" resultType="java.lang.String">
+<!--    SELECT-->
+<!--      (CASE-->
+<!--         WHEN lastOper = 1 THEN "寮�鍗�"-->
+<!--         WHEN lastOper = 2 THEN "琛ュ崱"-->
+<!--         WHEN lastOper = 3 THEN "鍏呭��"-->
+<!--         WHEN lastOper = 4 THEN "鎸傚け"-->
+<!--         WHEN lastOper = 5 THEN "娉ㄩ攢"-->
+<!--         WHEN lastOper = 6 THEN "瑙i攣"-->
+<!--         WHEN lastOper = 7 THEN "鍐叉"-->
+<!--         WHEN lastOper = 8 THEN "娑堣垂"-->
+<!--        END) AS stateName-->
+<!--    FROM se_client_card-->
+<!--    WHERE cardNum = ${cardNum}-->
+    SELECT
+        (CASE
+            WHEN state = 1 THEN '姝e父'
+            WHEN state = 2 THEN '宸叉敞閿�'
+            WHEN state = 3 THEN '宸叉寕澶�'
+        END) AS stateName
+    FROM se_client_card
+    WHERE cardNum = ${cardNum}
+  </select>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃璁板綍鏁帮紝搴旂敤绋嬪簭浣跨敤-->
+  <select id="getCardsCount" parameterType="java.util.Map" resultType="java.lang.Long">
+    SELECT
+        COUNT(*) AS recordCount
+    FROM se_client_card card
+        INNER JOIN se_client cli ON card.clientId = cli.id
+    <where>
+      <if test = "clientNum != null and clientNum !=''">
+        AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+      </if>
+
+      <if test = "clientName != null and clientName !=''">
+        AND cli.name like CONCAT('%',#{clientName},'%')
+      </if>
+
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
+      </if>
+    </where>
+  </select>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢�-->
+  <select id="getCards" resultType="com.dy.pipIrrGlobal.voSe.VoCards">
+    SELECT
+        cli.clientNum,
+        cli.name AS clientName,
+        card.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,
+        '鍐滄埛鍗�' AS cardType,
+        card.money
+    FROM se_client_card card
+        INNER JOIN se_client cli ON card.clientId = cli.id
+    <where>
+      <if test = "clientNum != null and clientNum !=''">
+        AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+      </if>
+
+      <if test = "clientName != null and clientName !=''">
+        AND cli.name like CONCAT('%',#{clientName},'%')
+      </if>
+
+      <if test = "cardNum != null and cardNum !=''">
+        AND card.cardNum like CONCAT('%',#{cardNum},'%')
+      </if>
+    </where>
+    ORDER BY card.id
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0