From 2a2885f45160b4048a27e75d5be03ba9232c7363 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 10 九月 2024 17:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 4717be2..b65027e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -32,7 +32,17 @@
<select id="page" resultMap="BaseResultMap">
SELECT
- wo.id,wo.status, wo.work_order_no, wo.serial_number,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.serial_number,
+ 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,
@@ -52,14 +62,11 @@
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
- <if test="query.workOrderNo != null and query.workOrderNo != ''">
- AND wo.work_order_no = #{query.workOrderNo}
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%'))
</if>
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
- </if>
- <if test="query.status == null or query.status == ''">
- AND wo.status = 'DISTRIBUTED'
</if>
<if test="query.start != null">
AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
@@ -289,4 +296,24 @@
<result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
<result column="error_names" property="errorType"/>
</resultMap>
+
+ <select id="detailByNo" resultType="com.ycl.platform.domain.vo.WorkOrderDetailVO">
+ SELECT
+ wo.id,
+ wo.work_order_no,
+ wo.serial_number,
+ dr.create_time as distributeTime,
+ m.name as source,
+ yw.unit_name,
+ yw.unit_contact,
+ yw.unit_contact_phone,
+ wo.overtime,
+ wo.processing_period,
+ wo.status
+ FROM
+ t_work_order wo
+ INNER JOIN t_work_order_distribute_record dr ON wo.work_order_no = dr.work_order_no AND dr.deleted = 0 AND wo.work_order_no = #{workOrderNo}
+ INNER JOIN t_monitor m ON m.serial_number = wo.serial_number
+ LEFT JOIN t_yw_unit yw ON yw.id = wo.unit_id AND yw.deleted = 0
+ </select>
</mapper>
--
Gitblit v1.8.0