From c8ae875dcfb55ac27a434f6b8ca40a5c80a5f9ee Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 24 十二月 2024 15:03:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
index 2cdd204..2c29293 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -224,21 +224,24 @@
ord.complete_time AS completeTime,
ord.dispatch_time AS dispatchTime,
ord.reject_times AS rejectTimes,
+ res.id AS proResultId,
+ IFNULL(res.state,0) AS proResultStateId,
CASE
WHEN ord.state = 1 THEN '鏈畬鎴�'
WHEN ord.state = 2 THEN '宸插畬鎴�'
END AS state,
CASE
- WHEN res.state = 1 THEN '宸蹭笂鎶�'
+ WHEN IFNULL(res.state,0) = 0 THEN '鏈笂鎶�'
+ WHEN res.state = 1 THEN '寰呭鏍�'
WHEN res.state = 2 THEN '宸查�氳繃'
- WHEN res.state = 3 THEN '宸查┏鍥�'
+ WHEN res.state = 3 THEN '琚┏鍥�'
ELSE '鏈笂鎶�'
END AS processingState
FROM ope_work_order ord
INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id
- LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id
+ LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id
WHERE ord.deleted = 0 AND ord.id = #{workOrderId}
</select>
@@ -265,9 +268,17 @@
INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id
- LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id
+ LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id
<where>
AND ord.deleted = 0
+
+ <if test = "dispatcherId != null">
+ AND ord.dispatcher_id = #{dispatcherId}
+ </if>
+
+ <if test = "inspectorId != null">
+ AND ord.inspector_id = #{inspectorId}
+ </if>
<if test = "dispatcher != null and dispatcher !=''">
AND us1.name like CONCAT('%',#{dispatcher},'%')
@@ -275,6 +286,10 @@
<if test = "inspector != null and inspector !=''">
AND us2.name like CONCAT('%',#{inspector},'%')
+ </if>
+
+ <if test = "state != null">
+ AND ord.state = #{state}
</if>
<if test = "timeStart != null and timeStop != null">
@@ -299,23 +314,34 @@
ord.complete_time AS completeTime,
ord.dispatch_time AS dispatchTime,
ord.reject_times AS rejectTimes,
+ IFNULL(res.state,0) AS proResultStateId,
CASE
WHEN ord.state = 1 THEN '鏈畬鎴�'
WHEN ord.state = 2 THEN '宸插畬鎴�'
END AS state,
CASE
- WHEN res.state = 1 THEN '宸蹭笂鎶�'
+ WHEN IFNULL(res.state,0) = 0 THEN '鏈笂鎶�'
+ WHEN res.state = 1 THEN '寰呭鏍�'
WHEN res.state = 2 THEN '宸查�氳繃'
- WHEN res.state = 3 THEN '宸查┏鍥�'
+ WHEN res.state = 3 THEN '琚┏鍥�'
ELSE '鏈笂鎶�'
- END AS processingState
+ END AS processingState,
+ res.id AS proResultId
FROM ope_work_order ord
INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id
- LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id
+ LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id
<where>
AND ord.deleted = 0
+
+ <if test = "dispatcherId != null">
+ AND ord.dispatcher_id = #{dispatcherId}
+ </if>
+
+ <if test = "inspectorId != null">
+ AND ord.inspector_id = #{inspectorId}
+ </if>
<if test = "dispatcher != null and dispatcher !=''">
AND us1.name like CONCAT('%',#{dispatcher},'%')
@@ -325,6 +351,10 @@
AND us2.name like CONCAT('%',#{inspector},'%')
</if>
+ <if test = "state != null">
+ AND ord.state = #{state}
+ </if>
+
<if test = "timeStart != null and timeStop != null">
AND ord.dispatch_time BETWEEN #{timeStart} AND #{timeStop}
</if>
--
Gitblit v1.8.0