From 69cd43d9303ed7cd985bd64379b4cc5b0aecef14 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 15 一月 2025 17:01:26 +0800
Subject: [PATCH] 离线工单审核通过修改状态

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index db29bbe..d0ecfcf 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -68,12 +68,15 @@
         <if test="query.unitId != null">
             AND wo.unit_id = #{query.unitId}
         </if>
-        <if test="query.errorType != null and query.errorType != ''">
+        <if test="query.errorTypeList != null and query.errorTypeList.size>0">
             AND (EXISTS (
             SELECT 1
             FROM t_work_order_error_type twoet
             WHERE twoet.work_order_no = wo.work_order_no
-            AND twoet.error_name = #{query.errorType}
+            AND twoet.error_name in
+            <foreach collection="query.errorTypeList" open="(" close=")" separator="," item="errorType">
+                        #{errorType}
+            </foreach>
             ))
         </if>
         <if test="query.keyword != null and query.keyword != ''">
@@ -142,12 +145,15 @@
         <if test="query.start != null and query.end != null">
             AND wo.create_time BETWEEN #{query.start} AND #{query.end}
         </if>
-        <if test="query.errorType != null and query.errorType !='' ">
+        <if test="query.errorTypeList != null and query.errorTypeList.size>0">
             AND (EXISTS (
             SELECT 1
             FROM t_work_order_error_type twoet
             WHERE twoet.work_order_no = wo.work_order_no
-            AND twoet.error_name = #{query.errorType}
+            AND twoet.error_name in
+            <foreach collection="query.errorTypeList" open="(" close=")" separator="," item="errorType">
+                #{errorType}
+            </foreach>
             ))
         </if>
         GROUP BY
@@ -353,7 +359,7 @@
     </insert>
 
     <select id="selectPassOrder" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
-        SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.distribute_time,woar.create_time as auditTime
+        SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.create_time as distributeTime,woar.create_time as auditTime
         FROM t_work_order wo
         LEFT JOIN t_work_order_error_type woet ON woet.work_order_no = wo.work_order_no
         LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no

--
Gitblit v1.8.0