From e18c4a8ac170fea6e079047a27f72032c80eee67 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 九月 2024 14:12:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index cb816f9..f724ab8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -447,6 +447,9 @@
<if test="intakeNum != null and intakeNum != ''">
AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
</if>
+ <if test="clientName != null and clientName != ''">
+ AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
+ </if>
<if test="rtuAddr != null and rtuAddr != ''">
AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
</if>
@@ -510,6 +513,9 @@
</if>
<if test="intakeNum != null and intakeNum != ''">
AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
+ </if>
+ <if test="clientName != null and clientName != ''">
+ AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
</if>
<if test="rtuAddr != null and rtuAddr != ''">
AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
@@ -1054,4 +1060,65 @@
</if>
</trim>
</select>
+
+ <!--鑾峰彇姘村崱娑堣垂璁板綍鏁伴噺锛岀鐞嗗钩鍙颁娇鐢�-->
+ <select id="getExpendsCount" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM rm_open_close_valve_history och
+ INNER JOIN se_client cli ON cli.id = och.client_id
+ INNER JOIN pr_intake inta ON inta.id = och.intake_id
+ <where>
+ AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL
+ AND och.cl_this_money> 0
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND och.cl_ic_card_no like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ </select>
+
+ <!--鑾峰彇姘村崱娑堣垂璁板綍锛岀鐞嗗钩鍙颁娇鐢�-->
+ <select id="getExpends" resultType="com.dy.pipIrrGlobal.voRm.VoExpend">
+ SELECT
+ cli.name AS clientName,
+ cli.clientNum,
+ och.cl_ic_card_no AS cardNum,
+ inta.name AS intakeName,
+ och.rtu_addr AS rtuAddr,
+ och.cl_this_money AS moneyAmount,
+ och.cl_this_amount AS waterAmount,
+ och.cl_this_time AS duration,
+ och.cl_dt AS operateTime
+ FROM rm_open_close_valve_history och
+ INNER JOIN se_client cli ON cli.id = och.client_id
+ INNER JOIN pr_intake inta ON inta.id = och.intake_id
+ <where>
+ AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL
+ AND och.cl_this_money> 0
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND och.cl_ic_card_no like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ ORDER BY och.cl_dt DESC
+ <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