From 628b80b5e7c84d77396d9acbbc21db6a75bbb241 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 06 十二月 2024 11:19:29 +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 | 12 +++++++++++-
1 files changed, 11 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..599e0cc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -224,6 +224,7 @@
ord.complete_time AS completeTime,
ord.dispatch_time AS dispatchTime,
ord.reject_times AS rejectTimes,
+ res.id AS proResultId,
CASE
WHEN ord.state = 1 THEN '鏈畬鎴�'
WHEN ord.state = 2 THEN '宸插畬鎴�'
@@ -285,6 +286,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 +321,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 +347,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