From b029979db841167a3b2b403fdb24dfbf5ffce615 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 17 二月 2025 14:10:41 +0800
Subject: [PATCH] 代码优化

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml |   22 ++++++++++++++--------
 1 files changed, 14 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 6601a2a..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,7 +268,7 @@
     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
 
@@ -311,21 +314,24 @@
         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
 

--
Gitblit v1.8.0