From daff229e064e7190c148e052f4f7e7b7ae201c0c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 23 八月 2024 17:47:07 +0800
Subject: [PATCH] 工单查询优化
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 5 +++--
1 files changed, 3 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..6ac03ab 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -15,6 +15,7 @@
<result column="overtime" property="overtime"/>
<result column="deduct" property="deduct"/>
<result column="errorType" property="errorType"/>
+ <result column="status" property="status"/>
<!-- <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>-->
</resultMap>
@@ -29,7 +30,7 @@
<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,
GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
@@ -53,7 +54,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, 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