From 34e795bedc57454c43b00cdf8e2cc2d9eb5a932a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 14:59:50 +0800
Subject: [PATCH] 优化轮灌组分页查询接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 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 54d03d4..6bc3433 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -13,11 +13,12 @@
     <result column="last_operate_time" jdbcType="TIMESTAMP" property="lastOperateTime" />
     <result column="in_use" jdbcType="TINYINT" property="inUse" />
     <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
+    <result column="open_time" jdbcType="TIMESTAMP" property="openTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, vc_num, client_id, money, state, last_operate, last_operate_time, in_use, intake_id, create_time
+    id, vc_num, client_id, money, state, last_operate, last_operate_time, in_use, intake_id, open_time, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -36,10 +37,10 @@
     <!--@mbg.generated-->
     insert into se_virtual_card (id, vc_num, client_id, 
       money, state, last_operate, last_operate_time,
-      in_use, intake_id, create_time)
+      in_use, intake_id, open_time, create_time)
     values (#{id,jdbcType=BIGINT}, #{vcNum,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, 
       #{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{lastOperate,jdbcType=TINYINT}, #{lastOperateTime,jdbcType=TIMESTAMP},
-      #{inUse,jdbcType=TINYINT}, #{intakeId,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})
+      #{inUse,jdbcType=TINYINT}, #{intakeId,jdbcType=BIGINT},#{openTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeVirtualCard">
     <!--@mbg.generated-->
@@ -72,6 +73,9 @@
       <if test="intakeId != null">
         intake_id,
       </if>
+      <if test="openTime != null">
+        open_time,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -103,6 +107,9 @@
       </if>
       <if test="intakeId != null">
         #{intakeId,jdbcType=BIGINT},
+      </if>
+      <if test="openTime != null">
+        #{openTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -137,6 +144,9 @@
       <if test="intakeId != null">
         intake_id = #{intakeId,jdbcType=BIGINT},
       </if>
+      <if test="openTime != null">
+        open_time = #{openTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -154,14 +164,15 @@
       last_operate_time = #{lastOperateTime,jdbcType=TIMESTAMP},
       in_use = #{inUse,jdbcType=TINYINT},
       intake_id = #{intakeId,jdbcType=BIGINT},
+      open_time = #{openTime,jdbcType=TIMESTAMP},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateVcCardNoUseStateByIntakeId" parameterType="java.lang.Long">
+  <update id="updateVcCardNoUseStateByIntakeId">
     update se_virtual_card
     set in_use = 0,
       intake_id = null
-    where intake_id = #{intakeId,jdbcType=BIGINT}
+    where intake_id = #{intakeId,jdbcType=BIGINT} and open_time &lt; #{now,jdbcType=TIMESTAMP}
   </update>
   <update id="updateMoney" >
     update se_virtual_card
@@ -189,7 +200,8 @@
     SELECT
       id,
       vc_num AS vcNum,
-      ROUND(money / 100, 2) AS money,
+<!--      ROUND(money / 100, 2) AS money,-->
+      money,
       in_use AS inUse,
       (CASE
         WHEN money &lt;= #{alarmValue} THEN true
@@ -210,6 +222,7 @@
     SELECT
         id,
         vc_num AS vcNum,
+<!--        ROUND(money / 100,2) AS money,-->
         money,
         in_use AS inUse,
         (CASE
@@ -232,11 +245,12 @@
     SELECT id FROM se_virtual_card WHERE state = 1 AND vc_num = #{vcNum}
   </select>
 
-  <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱ID-->
+  <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栧啘鎴穒d銆佸鍚嶃�佸湴鍧�-->
   <select id="getClientIdAndNameByVsCardNo" resultType="java.util.Map">
     SELECT
     cli.id AS clientId,
-    cli.name AS clientName
+    cli.name AS clientName,
+    cli.address AS clientAddress
     FROM se_virtual_card card
     INNER JOIN se_client cli ON card.client_id = cli.id
     WHERE card.state = 1 AND card.vc_num = #{vcNum}

--
Gitblit v1.8.0