From 272188e47087a8ef92eb0a48b122fa1c73ea94d3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 00:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2
---
src/main/resources/mapper/point/CustomerPointMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/point/CustomerPointMapper.xml b/src/main/resources/mapper/point/CustomerPointMapper.xml
index 004ba1c..b6bcd4e 100644
--- a/src/main/resources/mapper/point/CustomerPointMapper.xml
+++ b/src/main/resources/mapper/point/CustomerPointMapper.xml
@@ -45,12 +45,22 @@
AND t.record_date <= #{dto.recordDateEnd}
]]>
</if>
- <if test="dto.type!=null and dto.type != null">
+ <if test="dto.type!=null and dto.type != ''">
and t.type = #{dto.type}
</if>
<if test="dto.remarks!=null and dto.remarks != null">
and t.remarks like CONCAT('%',#{dto.remarks},'%')
</if>
+ <if test="dto.createTimeStart!=null">
+ <![CDATA[
+ AND t.create_time >= #{dto.createTimeStart}
+ ]]>
+ </if>
+ <if test="dto.createTimeEnd!=null ">
+ <![CDATA[
+ AND t.create_time <= #{dto.createTimeEnd}
+ ]]>
+ </if>
order by t.create_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3