From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 10:03:17 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
index d2bf388..fb0e3b3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
@@ -97,12 +97,25 @@
</foreach>
</insert>
- <select id="getErrorList" resultType="com.ycl.system.entity.SysDictData">
- SELECT da.dict_value, da.dict_label
+
+ <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
- WHERE oer.work_order_no = #{workOrderNo}
+ 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