From 2da75f7a5c4fee35770b88998dd15f33277a7a88 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 九月 2024 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 b65027e..b650439 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -238,7 +238,7 @@
FROM
t_work_order wo
WHERE
- wo.create_time BETWEEN #{start} AND #{end}
+ wo.create_time BETWEEN #{start} AND #{end} AND wo.status = 'AUDITING'
AND deleted = 0
</select>
@@ -316,4 +316,27 @@
INNER JOIN t_monitor m ON m.serial_number = wo.serial_number
LEFT JOIN t_yw_unit yw ON yw.id = wo.unit_id AND yw.deleted = 0
</select>
+ <select id="getRecoveryInfo" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ SELECT
+ wo.work_order_no,
+ u.unit_name,
+ u.unit_contact,
+ u.unit_contact_phone,
+ p.yw_person_name,
+ GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
+ FROM
+ t_work_order wo
+ INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+ INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
+ INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
+ WHERE
+ wo.deleted = 0
+ GROUP BY
+ wo.work_order_no,
+ u.unit_name,
+ u.unit_contact,
+ u.unit_contact_phone,
+ p.yw_person_name
+ </select>
</mapper>
--
Gitblit v1.8.0