From b1dc9988b9587add132a01faa6bc09e162fe1491 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 七月 2024 21:39:38 +0800
Subject: [PATCH] 1、开关阀报中增加农户关联; 2、工作报中增加农户关联; 3、取水口损失流量完善; 4、实现取水日取水量统计。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 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 54511ba..2e55f5e 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>
@@ -213,6 +214,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
@@ -240,11 +251,7 @@
       WHEN order_state = 2 THEN "宸叉敮浠�"
       END) AS orderStateName
     FROM se_vc_recharge
-    <where>
-      <if test = "orderState != null">
-         order_state = #{orderState,jdbcType=TINYINT}
-      </if>
-    </where>
+    where order_state = 2
     order by recharge_time DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
@@ -255,10 +262,6 @@
     SELECT
       COUNT(*)
     FROM se_vc_recharge
-    <where>
-      <if test = "orderState != null">
-         order_state = #{orderState,jdbcType=TINYINT}
-      </if>
-    </where>
+    where order_state = 2
   </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0