From 2fbd6770dd1307aae50d8013e94d1a8a588d185d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 八月 2024 17:49:05 +0800
Subject: [PATCH] 2024-08-02 朱宝民 修改营销模块项目名称

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 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..2e25990 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -194,14 +194,17 @@
     from rm_client_amount_day_last rcadl
     Left join se_client sc on sc.id = rcadl.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 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>
@@ -222,17 +225,20 @@
     from rm_client_amount_day_last rcadl
     Left join se_client sc on sc.id = rcadl.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 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