From 61cd88d889547379c1c30c534e56a590e2577f49 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 07 二月 2025 15:49:51 +0800
Subject: [PATCH] 涉嫌偷水功能修改sql语句

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
index 7e9c338..c472c69 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
@@ -8,25 +8,29 @@
         from rm_open_close_valve_history mTb
         left join pr_intake piTb on piTb.id = mTb.intake_id
         left join se_client scTb on scTb.id = mTb.client_id
-        <where>
-            <if test = "fromDate != null">
-                mTb.cl_dt <![CDATA[>=]]> #{fromDate, javaType=DATE, jdbcType=TIMESTAMP}
+        where mTb.cl_this_money = 0.0
+        <trim prefix="and" suffixOverrides="and">
+            <if test = "duration != null">
+                mTb.cl_this_time > #{duration, javaType=INTEGER, jdbcType=INTEGER} and
+            </if>
+           <if test = "fromDate != null">
+                mTb.cl_dt <![CDATA[>=]]> #{fromDate, javaType=DATE, jdbcType=TIMESTAMP} and
             </if>
             <if test = "intakeNum != null and intakeNum != '' ">
-                and piTb.name = #{intakeNum, jdbcType=VARCHAR}
+                piTb.name = #{intakeNum, jdbcType=VARCHAR} and
             </if>
             <if test = "clientNum != null and clientNum != '' ">
-                and scTb.clientNum = #{clientNum, jdbcType=VARCHAR}
+                scTb.clientNum = #{clientNum, jdbcType=VARCHAR} and
             </if>
             <if test = "clientName != null and clientName != '' ">
-                and scTb.name = #{clientName, jdbcType=VARCHAR}
+                scTb.name = #{clientName, jdbcType=VARCHAR} and
             </if>
-        </where>
+        </trim>
     </select>
 
     <select id="selectStealSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoSteal">
         select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId,
-        piTb.name as intakeNum,
+        piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
         scTb.name as clientName, scTb.clientNum as clientNum,
         mTb.op_dt as openDt, mTb.op_type as opType, mTb.op_total_amount as openTotalAmount, mTb.op_remain_money as openRemainMoney,
         mTb.cl_dt as closeDt, mTb.cl_type as clType, mTb.cl_total_amount as closeTotalAmount, mTb.cl_remain_money as closeRemainMoney,
@@ -34,20 +38,24 @@
         from rm_open_close_valve_history mTb
         left join pr_intake piTb on piTb.id = mTb.intake_id
         left join se_client scTb on scTb.id = mTb.client_id
-        <where>
+        where mTb.cl_this_money = 0.0
+        <trim prefix="and" suffixOverrides="and">
+            <if test = "duration != null">
+                mTb.cl_this_time > #{duration, javaType=INTEGER, jdbcType=INTEGER} and
+            </if>
             <if test = "fromDate != null">
-                mTb.cl_dt <![CDATA[>=]]> #{fromDate, javaType=DATE, jdbcType=TIMESTAMP}
+                mTb.cl_dt <![CDATA[>=]]> #{fromDate, javaType=DATE, jdbcType=TIMESTAMP} and
             </if>
             <if test = "intakeNum != null and intakeNum != '' ">
-                and piTb.name = #{intakeNum, jdbcType=VARCHAR}
+                piTb.name = #{intakeNum, jdbcType=VARCHAR} and
             </if>
             <if test = "clientNum != null and clientNum != '' ">
-                and scTb.clientNum = #{clientNum, jdbcType=VARCHAR}
+                scTb.clientNum = #{clientNum, jdbcType=VARCHAR} and
             </if>
             <if test = "clientName != null and clientName != '' ">
-                and scTb.name = #{clientName, jdbcType=VARCHAR}
+                scTb.name = #{clientName, jdbcType=VARCHAR} and
             </if>
-        </where>
+        </trim>
         order by mTb.id DESC
         <trim prefix="limit " >
             <if test="start != null and count != null">

--
Gitblit v1.8.0