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 |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 0be82af..e2cbdd6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -185,13 +185,13 @@
            Left join se_client sc on sc.id = rcad.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 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>
@@ -213,16 +213,16 @@
     Left join se_client sc on sc.id = rcad.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 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>
@@ -230,7 +230,7 @@
 
 
   <select id="statisticsByClient" resultType="com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics">
-    select client_id, sum(amount) as amount, sum(money) as amount
+    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

--
Gitblit v1.8.0