From 6f7cc7c14b4532120e9e6827ca0feb2c9aa4c2c7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 24 一月 2025 04:10:16 +0800
Subject: [PATCH] 利旧设备Osd，ping任务离线时间点取最近两条，工单审核bug，重点指挥图像调整
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
index de62a44..fb0e3b3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
@@ -99,13 +99,23 @@
<select id="getErrorListByNumbers" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
- SELECT oer.serial_number,oer.ip,da.dict_value as errorType
+ SELECT m.ip,da.dict_value as errorType
FROM t_work_order_error_type oer
INNER JOIN sys_dict_data da ON oer.error_name = da.dict_value
+ left join t_work_order wo on oer.work_order_no = wo.work_order_no
+ left join t_monitor m on m.serial_number = wo.serial_number
WHERE oer.work_order_no in
<foreach collection="workOrderNos" separator="," open="(" close=")" item="workOrderNo">
#{workOrderNo}
</foreach>
ORDER BY oer.create_time
</select>
+
+ <select id="getErrorList" resultType="com.ycl.system.entity.SysDictData">
+ SELECT da.dict_value, da.dict_label
+ FROM t_work_order_error_type oer
+ INNER JOIN sys_dict_data da ON oer.error_name = da.dict_value
+ WHERE oer.work_order_no = #{workOrderNo}
+ ORDER BY oer.create_time
+ </select>
</mapper>
--
Gitblit v1.8.0