From abd93f604df5251bf993ac483978e8fb084071db Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 17 八月 2023 09:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index c8fb3d7..edb56c3 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -453,11 +453,11 @@
<if test="materialName != null and materialName !=''">
AND (c.`name` like concat('%', #{materialName},'%') or c.`code` like concat('%', #{materialName},'%'))
</if>
- <if test="startDate != null">
- AND a.`CREATE_TIME` >= #{startDate}
+ <if test="startDate != null and startDate != ''">
+ AND a.`CREATE_TIME` >= concat(#{startDate},' 00:00:00')
</if>
- <if test="endDate != null">
- AND #{endDate} >= a.`CREATE_TIME`
+ <if test="endDate != null and endDate != ''">
+ AND concat(#{endDate},' 23:59:59') >= a.`CREATE_TIME`
</if>
<if test="userId != null">
AND a.`CREATE_USER` = #{userId}
@@ -479,10 +479,10 @@
AND `CREATE_USER` = #{userId}
</if>
<if test="startDate != null">
- AND a.`CREATE_TIME` >= #{startDate}
+ AND `CREATE_TIME` >= #{startDate}
</if>
<if test="endDate != null">
- AND #{endDate} >= a.`CREATE_TIME`
+ AND #{endDate} >= `CREATE_TIME`
</if>
group by `CREATE_USER`
<!-- order by `CREATE_TIME` desc-->
--
Gitblit v1.9.3