From 29807fea73899a5b775eb2c7d8e1c05ea8bc0c3d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 八月 2024 17:00:31 +0800
Subject: [PATCH] 2024-08-02 朱宝民 优化获取全部取水口接口,包含经纬度及12小时之内的报警信息

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
index dd319b6..cbe262b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -21,7 +21,8 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select 
-    <include refid="Base_Column_List" />
+<!--    <include refid="Base_Column_List" />-->
+    *
     from se_virtual_card
     where id = #{id,jdbcType=BIGINT}
   </select>
@@ -169,7 +170,8 @@
   <!--鑾峰彇鍐滄埛鍏ㄩ儴铏氭嫙鍗�-->
   <select id="getVCs" resultType="com.dy.pipIrrGlobal.voSe.VoVirtualCard">
     SELECT
-      CAST(id AS char) AS id,
+<!--      CAST(id AS char) AS id,-->
+      id,
       vc_num AS vcNum,
       money,
       in_use AS inUse,
@@ -189,7 +191,7 @@
   <!--鏍规嵁铏氭嫙鍗D鑾峰彇铏氭嫙鍗″璞�-->
   <select id="getVcById" resultType="com.dy.pipIrrGlobal.voSe.VoVirtualCard">
     SELECT
-        CAST(id AS char) AS id,
+        id,
         vc_num AS vcNum,
         money,
         in_use AS inUse,
@@ -213,6 +215,16 @@
     SELECT id FROM se_virtual_card WHERE vc_num = #{vcNum}
   </select>
 
+  <!--鏍规嵁铏氭嫙鍗$紪鍙疯幏鍙栬櫄鎷熷崱ID-->
+  <select id="getClientIdAndNameByVsCardNo" resultType="java.util.Map">
+    SELECT
+    cli.id AS clientId,
+    cli.name AS clientName
+    FROM se_virtual_card card
+    INNER JOIN se_client cli ON card.client_id = cli.id
+    WHERE card.vc_num = #{vcNum}
+  </select>
+
   <!--鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈣櫄鎷熷崱缂栧彿-->
   <select id="getVcCardNumOfMax"  resultType="java.lang.String">
     SELECT vc_num
@@ -222,4 +234,35 @@
     LIMIT 0,1
   </select>
 
+  <!--鑾峰彇铏氭嫙鍗″厖鍊艰褰�-->
+  <select id="getVcRechargeRecords" resultType="com.dy.pipIrrGlobal.voSe.VoVcRecharge" >
+    SELECT
+      CAST(id AS char) AS id,
+      CAST(vc_id AS char) AS vcId,
+      CAST(client_id AS char) AS clientId,
+      money,
+      after_recharge AS afterRecharge,
+      order_number AS orderNumber,
+      recharge_amount AS rechargeAmount,
+      order_time AS orderTime,
+      recharge_time AS rechargeTime,
+      order_state AS orderState,
+      (CASE
+      WHEN order_state = 1 THEN "鏈敮浠�"
+      WHEN order_state = 2 THEN "宸叉敮浠�"
+      END) AS orderStateName
+    FROM se_vc_recharge
+    where order_state = 2
+    order by recharge_time DESC
+    <if test="pageCurr != null and pageSize != null">
+      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
+    </if>
+  </select>
+
+  <select id="getRechargeRecordCount" resultType="java.lang.Long">
+    SELECT
+      COUNT(*)
+    FROM se_vc_recharge
+    where order_state = 2
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0