From e89d76539cc91bd13acabbf25a12312d2f8bba56 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 16 十二月 2025 21:27:06 +0800
Subject: [PATCH] 超过17点不接受报警
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 1d1099d..65f8419 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -76,13 +76,13 @@
<if test="type!=null">
and ubc.category=#{type}
</if>
- <if test="code!=null">
+ <if test="code!=null and code!=''">
and ubc.code=#{code}
</if>
- <if test="categoryBig != null">
+ <if test="categoryBig != null and categoryBig!=''">
and t3.name like concat('%', #{categoryBig},'%')
</if>
- <if test="categorySmall != null">
+ <if test="categorySmall != null and categoryBig!=''">
and t4.name like concat('%', #{categorySmall},'%')
</if>
<if test="street != null">
@@ -477,17 +477,21 @@
<select id="getWorkOrder" resultType="com.ycl.vo.casePool.WorkOrderVO">
SELECT username as name,count(DISTINCT id) taskCount,SUM(CASE WHEN state>7 THEN 1 ELSE 0 END) finishCount
from (
- SELECT a.username , bc.id,max(bc.state) state
- from ums_base_case bc
- INNER JOIN ums_dispose_record dr on bc.id = dr.base_case_id
- INNER JOIN ums_admin a on dr.handler_id = a.id
- where ( bc.state = 6 or bc.state = 7
- or bc.state = 8 or bc.state = 9)
- <if test="keyword !=''and keyword!=null">
- and a.username like concat('%', #{keyword},'%')
- </if>
- GROUP BY a.username ,bc.id
- ) tmp
+ SELECT a.username , bc.id,max(bc.state) state
+ from ums_base_case bc
+ INNER JOIN ums_dispose_record dr on bc.id = dr.base_case_id
+ INNER JOIN ums_admin a on dr.handler_id = a.id
+ where ( bc.state = 6 or bc.state = 7
+ or bc.state = 8 or bc.state = 9)
+ <if test="keyword !=''and keyword!=null">
+ and a.username like concat('%', #{keyword},'%')
+ </if>
+ <if test="startTime !=''and startTime!=null and endTime!=''and endTime!=null">
+ and bc.create_time BETWEEN #{startTime}
+ AND #{endTime}
+ </if>
+ GROUP BY a.username ,bc.id
+ ) tmp
GROUP BY username
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0