From 42beb426f466d79c55668c4d854e52613febb0da Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 24 七月 2024 15:14:51 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 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..080caae 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 >= #{startDt,jdbcType=TIMESTAMP} + and rcad.dt >= #{startDt,jdbcType=DATE} </if> <if test="endDt != null"> - and rash.dt <= #{endDt,jdbcType=TIMESTAMP} + and rcad.dt <= #{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 >= #{startDt,jdbcType=TIMESTAMP} + and rcad.dt >= #{startDt,jdbcType=DATE} </if> <if test="endDt != null"> - and rash.dt <= #{endDt,jdbcType=TIMESTAMP} + and rcad.dt <= #{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> -- Gitblit v1.8.0