From 2b0e875855e781c16e32187aa5552ee12ddcefa0 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 12:11:55 +0800
Subject: [PATCH] #产出计算
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index edb56c3..b01670d 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -444,6 +444,7 @@
left join unit d on a.UNIT_ID = d.ID
left join procedures f on a.PROCEDURE_ID =f.ID
where a.DELETED = 0
+ and a.TYPE = 1
<if test="rootDepartId != null">
AND a.`ROOT_DEPART_ID` = #{rootDepartId}
</if>
@@ -478,11 +479,11 @@
<if test="userId != null">
AND `CREATE_USER` = #{userId}
</if>
- <if test="startDate != null">
- AND `CREATE_TIME` >= #{startDate}
+ <if test="startDate != null and startDate != ''">
+ AND `CREATE_TIME` >= concat(#{startDate},' 00:00:00')
</if>
- <if test="endDate != null">
- AND #{endDate} >= `CREATE_TIME`
+ <if test="endDate != null and endDate != ''">
+ AND concat(#{endDate},' 23:59:59') >= `CREATE_TIME`
</if>
group by `CREATE_USER`
<!-- order by `CREATE_TIME` desc-->
--
Gitblit v1.9.3