From 25c0f523fccd89da32077f8f9b3da2a0d2502de2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 12:08:10 +0800
Subject: [PATCH] 工单阈值增加排序
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 5f18c6c..82d305d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -15,6 +15,8 @@
<result column="overtime" property="overtime"/>
<result column="deduct" property="deduct"/>
<result column="errorType" property="errorType"/>
+ <result column="status" property="status"/>
+ <result column="source" property="source"/>
<!-- <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>-->
</resultMap>
@@ -29,12 +31,14 @@
<select id="page" resultMap="BaseResultMap">
SELECT
- wo.id,wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
u.unit_name,
p.yw_person_name,
+ tm.name as source,
GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
FROM
t_work_order wo
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
@@ -53,7 +57,7 @@
AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
</if>
GROUP BY
- wo.id,wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ wo.id, wo.status, wo.work_order_no,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,
p.yw_person_name
ORDER BY wo.create_time DESC
--
Gitblit v1.8.0