From 27c0c61e48bfb3e870d44b3b53a820568fcce5d5 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 31 七月 2024 11:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
index 5c0e8fb..6ef3a61 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -79,9 +79,7 @@
<select id="selectSome" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" >
- <property name="alias" value="r"/>
- </include>
+ <include refid="Base_Column_List" />
from ba_log r
<trim prefix="where " suffixOverrides="and">
<if test="userId != null and userId != ''">
@@ -94,7 +92,7 @@
content like concat('%', #{content}, '%') and
</if>
<if test="dt != null and dt != '' ">
- dt = #{dt,jdbcType=TIMESTAMP} and
+ DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="ip != null and ip != '' ">
ip =#{ip,jdbcType=VARCHAR} and
@@ -122,7 +120,7 @@
content like concat('%', #{content}, '%') and
</if>
<if test="dt != null and dt != '' ">
- dt = #{dt,jdbcType=TIMESTAMP} and
+ DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="ip != null and ip != '' ">
ip =#{ip,jdbcType=VARCHAR} and
--
Gitblit v1.8.0