From a39807064a500875d89bc46edcd2d0b3654575a9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 24 七月 2024 15:14:46 +0800
Subject: [PATCH] 取水口日取水量漏损（历史） 取水口日取水量漏损（最新） 修改控制器报警与状态查询的排序、 修改农户日用水量统计的排序、日期类型 重构代码放置结构

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index 8179361..f674e37 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -195,13 +195,13 @@
     Left join se_client sc on sc.id = rcadl.client_id
     <where>
       <if test="clientName != null">
-        and sc.name = #{clientName,jdbcType=VARCHAR}
+        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
-        and rash.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
+        and rcadl.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
       <if test="endDt != null">
-        and rash.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
+        and rcadl.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
     </select>
@@ -223,16 +223,16 @@
     Left join se_client sc on sc.id = rcadl.client_id
     <where>
       <if test="clientName != null">
-        and sc.name = #{clientName,jdbcType=VARCHAR}
+        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
-        and rash.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
+        and rcadl.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
       <if test="endDt != null">
-        and rash.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
+        and rcadl.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rcadl.dt DESC
+    ORDER BY rcadl.id DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
     </if>

--
Gitblit v1.8.0