From 3d647966bc41215e72cba86860cce5075896ae93 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 24 十月 2024 17:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 9 +++++++--
1 files changed, 7 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 b9d5398..80271e0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -8,6 +8,9 @@
<result column="create_time" property="createTime"/>
<result column="work_order_no" property="workOrderNo"/>
<result column="unit_id" property="unitId"/>
+ <result column="unit_name" property="unitName"/>
+ <result column="unit_contact" property="unitContact"/>
+ <result column="unit_contact_phone" property="unitContactPhone"/>
<result column="yw_people_id" property="ywPeopleId"/>
<result column="yw_handle_time" property="ywHandleTime"/>
<result column="yw_result" property="ywResult"/>
@@ -44,6 +47,8 @@
wo.overtime,
wo.deduct,
u.unit_name,
+ u.unit_contact,
+ u.unit_contact_phone,
p.yw_person_name,
tm.name as source,
GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType,
@@ -58,12 +63,12 @@
LEFT JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
WHERE
- wo.deleted = 0
+ wo.deleted = 0 and wo.status != 'WAIT_DISTRIBUTE'
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
<if test="query.keyword != null and query.keyword != ''">
- AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%'))
+ AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%') or wo.serial_number like concat('%', #{query.keyword}, '%'))
</if>
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
--
Gitblit v1.8.0