From 7af935e6a092193adf309f3a2d700f049b4b63d8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 14:11:49 +0800
Subject: [PATCH] 解决冲突

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 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 cbd5d43..e2cbdd6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -178,4 +178,62 @@
       rtu_dt_last = #{rtuDtLast,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍鎬绘暟-->
+  <select id="getRecordCount" resultType="java.lang.Long">
+    select count(*)
+    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 like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
+      </if>
+      <if test="startDt != null">
+        and rcad.dt &gt;= #{startDt,jdbcType=DATE}
+      </if>
+      <if test="endDt != null">
+        and rcad.dt &lt;= #{endDt,jdbcType=DATE}
+      </if>
+    </where>
+    </select>
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍-->
+  <select id="getClientAmountDayHistory" resultType="com.dy.pipIrrGlobal.voRm.VoClientAmountDay">
+    select
+    CAST(rcad.client_id AS char)AS clientId,
+    rcad.amount as amount,
+    rcad.money as money,
+    rcad.dt as dt,
+    rcad.open_dt_last as openDtLast,
+    rcad.close_dt_last as closeDtLast,
+    rcad.this_amount_last as thisAmountLast,
+    rcad.this_money_last as thisMoneyLast,
+    rcad.this_time_last as thisTimeLast,
+    rcad.rtu_dt_last as rtuDtLast,
+    sc.name as clientName
+    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 like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
+      </if>
+      <if test="startDt != null">
+        and rcad.dt &gt;= #{startDt,jdbcType=DATE}
+      </if>
+      <if test="endDt != null">
+        and rcad.dt &lt;= #{endDt,jdbcType=DATE}
+      </if>
+    </where>
+    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