From 02d115e902ef2091fa5f0202ec3909f1c2e66923 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 16 四月 2025 14:01:57 +0800
Subject: [PATCH] 设备未知状态修改，工单照片清理定时任务，工单逻辑删除照片，以及保存最新的5张，数据导出离线数统计，在线率统计的合计修改
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
index 78a1e49..fb0e3b3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
@@ -98,14 +98,24 @@
</insert>
- <select id="getErrorListByNumbers" resultMap="com.ycl.platform.domain.vo.WorkOrderVO">
- SELECT oer.serial_number,oer.ip,da.dict_value as errorType
+ <select id="getErrorListByNumbers" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ 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