From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
index 8c8f8ef..0c43003 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -184,14 +184,17 @@
     from rm_client_amount_day rcad
            Left join se_client sc on sc.id = rcad.client_id
     <where>
-      <if test="clientName != null">
-        and sc.name = #{clientName,jdbcType=VARCHAR}
+      <if test="clientName != null and clientName != '' ">
+        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
+      </if>
+      <if test="clientId != null and clientId != ''">
+        and rcad.client_id = #{clientId}
       </if>
       <if test="startDt != null">
-        and rash.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
+        and rcad.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
       <if test="endDt != null">
-        and rash.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
+        and rcad.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
     </select>
@@ -212,19 +215,31 @@
     from rm_client_amount_day rcad
     Left join se_client sc on sc.id = rcad.client_id
     <where>
-      <if test="clientName != null">
-        and sc.name = #{clientName,jdbcType=VARCHAR}
+      <if test="clientName != null and clientName != '' ">
+        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
+      </if>
+      <if test="clientId != null and clientId != ''">
+        and rcad.client_id = #{clientId}
       </if>
       <if test="startDt != null">
-        and rash.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
+        and rcad.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
       <if test="endDt != null">
-        and rash.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
+        and rcad.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rcad.dt DESC
+    ORDER BY rcad.id DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
     </if>
   </select>
+
+
+  <select id="statisticsByClient" resultType="com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics">
+    select client_id, sum(amount) as amount, sum(money) as money
+    from rm_client_amount_day
+    where id <![CDATA[>=]]> #{startId,jdbcType=BIGINT} and id <![CDATA[<]]> #{endId,jdbcType=BIGINT}
+    group by client_id
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0