From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 364b380..a9387f9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -13,6 +13,7 @@
<result column="yw_result" property="ywResult"/>
<result column="yw_condition" property="ywCondition"/>
<result column="yw_check_result" property="ywCheckResult"/>
+ <result column="overtime" property="overtime"/>
</resultMap>
<select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
@@ -22,17 +23,17 @@
p.yw_person_name
FROM
t_work_order wo
- 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'
+ 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
where
- wo.deleted = '0'
+ wo.deleted = 0
<if test="query.workOrderNo != null and query.workOrderNo != ''">
AND wo.work_order_no = #{query.workOrderNo}
</if>
<if test="query.status != null">
AND wo.status = #{query.status}
</if>
- <if test="query.errorType != null and query.errType != ''">
+ <if test="query.errorType != null and query.errorType != ''">
AND wo.error_type = #{query.errorType}
</if>
<if test="query.start != null">
@@ -48,14 +49,16 @@
p.yw_person_name
FROM
t_work_order wo
- 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'
+ 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
where
- wo.deleted = '0'
- and wo.status = 'WAIT_DISTRIBUTE'
+ wo.deleted = 0
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
+ <if test="query.status != null and query.status != ''">
+ AND wo.status = #{query.status}
+ </if>
ORDER BY wo.create_time DESC
</select>
--
Gitblit v1.8.0