From d27176de051789e2725c5b21c7017729aa36b913 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 03 十二月 2024 11:30:35 +0800
Subject: [PATCH] 重构获取处理结果详情接口,照片列表、音频列表、视频列表改为JSONArray类型

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 bb25f7a..ccf7545 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -285,6 +285,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>
@@ -316,7 +320,8 @@
             WHEN res.state = 2 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
@@ -341,6 +346,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