From 9b55891e6dd57bc244e6c5654434b32e05c83496 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:10:25 +0800
Subject: [PATCH] 异常监控排除已经审核过的工单作为状态
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index b650439..10b5140 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -68,14 +68,14 @@
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
</if>
- <if test="query.start != null">
- AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
+ <if test="query.start != null and query.end != null">
+ AND wo.create_time BETWEEN #{query.start} AND #{query.end}
</if>
GROUP BY
wo.id, wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
u.unit_name,
p.yw_person_name
- ORDER BY wo.create_time DESC
+ ORDER BY wo.work_order_no DESC
</select>
<select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
@@ -209,7 +209,7 @@
LEFT JOIN t_yw_point p ON w.serial_number = p.serial_number AND p.deleted = 0
WHERE w.deleted = 0
<if test="dataScope == 1"> AND p.province_tag = 1 </if>
- <if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.dept_tag = 1 </if>
<if test="deptId != null"> AND p.dept_id = #{deptId} </if>
</select>
@@ -224,10 +224,10 @@
LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
WHERE d.del_flag = 0 AND d.area IS NOT NULL
<if test="dataScope == 1"> AND p.province_tag = 1 </if>
- <if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.dept_tag = 1 </if>
<!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
GROUP BY d.area, d.dept_id
- ORDER BY d.dept_id
+ ORDER BY d.area_code
</select>
<select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
@@ -238,8 +238,8 @@
FROM
t_work_order wo
WHERE
- wo.create_time BETWEEN #{start} AND #{end} AND wo.status = 'AUDITING'
- AND deleted = 0
+ wo.status = 'YW_HANDLE'
+ AND wo.deleted = 0
</select>
<insert id="addMany">
--
Gitblit v1.8.0