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/SeCardOperateMapper.xml |   56 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index c16ceaf..56eb07e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -289,9 +289,11 @@
       </if>
     </where>
     ORDER BY ope.operate_dt DESC
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${pageCurr}, ${pageSize}
-    </if>
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
   </select>
 
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍鏁�-->
@@ -486,23 +488,23 @@
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�-->
   <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCardNew">
     SELECT
-    CAST(ope.id AS char) AS id ,
-    cli.name AS clientName,
-    cli.clientNum AS clientNum,
-    card.cardNum AS cardNum,
-    card.state AS state,
-    (CASE
-    WHEN card.state = 1 THEN "姝e父"
-    WHEN card.state = 2 THEN "宸叉敞閿�"
-    WHEN card.state = 3 THEN "宸叉寕澶�"
-    END) AS stateName,
-    ope.card_cost AS cardCost,
-    ope.payment_id AS paymentId,
-    (SELECT `name` FROM ba_user WHERE id =  ope.operator) AS operator,
-    ope.operate_dt AS operateDt
+        CAST(ope.id AS char) AS id ,
+        cli.name AS clientName,
+        cli.clientNum AS clientNum,
+        card.cardNum AS cardNum,
+        card.state AS state,
+        (CASE
+          WHEN card.state = 1 THEN "姝e父"
+          WHEN card.state = 2 THEN "宸叉敞閿�"
+          WHEN card.state = 3 THEN "宸叉寕澶�"
+        END) AS stateName,
+        ope.card_cost AS cardCost,
+        ope.payment_id AS paymentId,
+        (SELECT `name` FROM ba_user WHERE id =  ope.operator) AS operator,
+        ope.operate_dt AS operateDt
     FROM se_card_operate ope
-    INNER JOIN se_client_card card ON ope.card_id = card.id
-    INNER JOIN se_client cli ON ope.client_id = cli.id
+      INNER JOIN se_client_card card ON ope.card_id = card.id
+      INNER JOIN se_client cli ON ope.client_id = cli.id
     <where>
       AND ope.operate_type = 1
       <if test = "clientName != null and clientName !=''">
@@ -522,9 +524,11 @@
       </if>
     </where>
     ORDER BY ope.operate_dt DESC
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${pageCurr}, ${pageSize}
-    </if>
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
   </select>
 
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍鏁伴噺-->
@@ -579,8 +583,10 @@
       </if>
     </where>
     ORDER BY ope.operate_dt DESC
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${pageCurr}, ${pageSize}
-    </if>
+    <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