From 742b6bbac1b4609386817a6e6fb489ec098a5490 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 21 一月 2025 18:29:44 +0800
Subject: [PATCH] 重构获取分水房详情接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml |   51 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 39 insertions(+), 12 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..23981d4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -8,6 +8,7 @@
     <result column="client_id" jdbcType="BIGINT" property="clientId" />
     <result column="amount" jdbcType="FLOAT" property="amount" />
     <result column="money" jdbcType="FLOAT" property="money" />
+    <result column="times" jdbcType="INTEGER" property="times" />
     <result column="dt" jdbcType="DATE" property="dt" />
     <result column="open_dt_last" jdbcType="TIMESTAMP" property="openDtLast" />
     <result column="close_dt_last" jdbcType="TIMESTAMP" property="closeDtLast" />
@@ -18,7 +19,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, client_id, amount, money, dt, open_dt_last, close_dt_last, this_amount_last, this_money_last,
+    id, client_id, amount, money, times, dt, open_dt_last, close_dt_last, this_amount_last, this_money_last,
     this_time_last, rtu_dt_last
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -43,11 +44,11 @@
   </delete>
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay">
     <!--@mbg.generated-->
-    insert into rm_client_amount_day (id, client_id, amount, money,
+    insert into rm_client_amount_day (id, client_id, amount, money, times,
       dt, open_dt_last, close_dt_last, 
       this_amount_last, this_money_last, this_time_last,
       rtu_dt_last)
-    values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT},
+    values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT}, #{times,jdbcType=FLOAT},
       #{dt,jdbcType=DATE}, #{openDtLast,jdbcType=TIMESTAMP}, #{closeDtLast,jdbcType=TIMESTAMP}, 
       #{thisAmountLast,jdbcType=FLOAT}, #{thisMoneyLast,jdbcType=FLOAT}, #{thisTimeLast,jdbcType=INTEGER},
       #{rtuDtLast,jdbcType=TIMESTAMP})
@@ -67,6 +68,9 @@
       </if>
       <if test="money != null">
         money,
+      </if>
+      <if test="times != null">
+        times,
       </if>
       <if test="dt != null">
         dt,
@@ -102,6 +106,9 @@
       </if>
       <if test="money != null">
         #{money,jdbcType=FLOAT},
+      </if>
+      <if test="times != null">
+        #{times,jdbcType=INTEGER},
       </if>
       <if test="dt != null">
         #{dt,jdbcType=DATE},
@@ -139,6 +146,9 @@
       <if test="money != null">
         money = #{money,jdbcType=FLOAT},
       </if>
+      <if test="times != null">
+        times = #{times,jdbcType=INTEGER},
+      </if>
       <if test="dt != null">
         dt = #{dt,jdbcType=DATE},
       </if>
@@ -169,6 +179,7 @@
     set client_id = #{clientId,jdbcType=BIGINT},
       amount = #{amount,jdbcType=FLOAT},
       money = #{money,jdbcType=FLOAT},
+      times = #{times,jdbcType=INTEGER},
       dt = #{dt,jdbcType=DATE},
       open_dt_last = #{openDtLast,jdbcType=TIMESTAMP},
       close_dt_last = #{closeDtLast,jdbcType=TIMESTAMP},
@@ -184,14 +195,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>
@@ -201,6 +215,7 @@
     CAST(rcad.client_id AS char)AS clientId,
     rcad.amount as amount,
     rcad.money as money,
+    rcad.times as times,
     rcad.dt as dt,
     rcad.open_dt_last as openDtLast,
     rcad.close_dt_last as closeDtLast,
@@ -212,19 +227,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, sum(times) as times
+    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