From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarColorMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarColorMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarColorMapper.xml
index b4ecc73..01f8f47 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarColorMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarColorMapper.xml
@@ -17,8 +17,8 @@
name as name,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i:%s') as insertTime
from t_car_color where state = 1
- <if test="null != createTime and '' != createTime">
- and insertTime between CONCAT(#{createTime}, ' 00:00:00') and CONCAT(#{createTime}, ' 23:59:59')
+ <if test="null != start and '' != start and null != end and '' != end">
+ and insertTime between CONCAT(#{start}, ' 00:00:00') and CONCAT(#{end}, ' 23:59:59')
</if>
<if test="null != name and '' != name">
and name like CONCAT('%', #{name}, '%')
@@ -34,8 +34,8 @@
select
count(1)
from t_car_color where state = 1
- <if test="null != createTime and '' != createTime">
- and insertTime between CONCAT(#{createTime}, ' 00:00:00') and CONCAT(#{createTime}, ' 23:59:59')
+ <if test="null != start and '' != start and null != end and '' != end">
+ and insertTime between CONCAT(#{start}, ' 00:00:00') and CONCAT(#{end}, ' 23:59:59')
</if>
<if test="null != name and '' != name">
and name like CONCAT('%', #{name}, '%')
--
Gitblit v1.7.1