From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改，定时任务在线问题修改新增导出扣分明细功能
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 10c2fcd..39f5363 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -88,6 +88,9 @@
<if test="query.start != null and query.end != null">
AND wo.create_time BETWEEN #{query.start} AND #{query.end}
</if>
+ <if test="query.dept != null and query.dept != ''">
+ AND wo.serial_number LIKE CONCAT(#{query.dept}, '%')
+ </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,
@@ -187,7 +190,6 @@
LEFT JOIN sys_user su ON su.user_id = odr.user_id
WHERE
wo.deleted = 0
- AND wo.create_time BETWEEN #{startDate} AND #{endDate}
AND wo.status = 'WAIT_DISTRIBUTE'
GROUP BY
wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time,
@@ -354,6 +356,8 @@
COUNT(IF(w.status != 'AUDITING_SUCCESS' and w.status != 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) AS doneNum
FROM t_work_order w
+ INNER JOIN t_monitor tm ON w.serial_number = tm.serial_number
+ INNER JOIN t_yw_unit u ON w.unit_id = u.id AND u.deleted = 0
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_video = 1 or p.province_tag_car = 1 or p.province_tag_face = 1)</if>
--
Gitblit v1.8.0