From 23302186a81c1b6f3e5f398f21b057350bfd34e8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 16 一月 2025 12:18:08 +0800
Subject: [PATCH] 工单扣分处理时间调整逻辑

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index d0ecfcf..b10788e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -359,12 +359,16 @@
     </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.create_time as distributeTime,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
         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
-        WHERE wo.deleted = 0 AND wo.status = #{status}  AND woar.result = #{auditStatus}
-        AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
+        WHERE wo.deleted = 0 AND wo.deduct = 0 AND wo.status = #{status}
+        AND woet.error_name in
+        <foreach collection="errorList" item="error" separator="," open="(" close=")">
+            #{error}
+        </foreach>
+        AND woar.create_time between #{startTime} and #{endTime} and woar.result = #{auditStatus}
     </select>
 
     <update id="updateMany">
@@ -467,4 +471,18 @@
             </foreach>
         </where>
     </select>
+
+    <select id="getAuditTimeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+        select work_order_no ,create_time as auditTime from t_work_order_auditing_record where work_order_no in
+        <foreach collection="workOrderNos" item="no" open="(" close=")" separator=",">
+            #{no}
+        </foreach>
+    </select>
+    <select id="getHandleTimeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+        select work_order_no ,create_time as handleTime from t_work_order_yw_condition_record
+        where sys_msg = 0 and  work_order_no in
+        <foreach collection="workOrderNos" item="no" open="(" close=")" separator=",">
+            #{no}
+        </foreach>
+    </select>
 </mapper>

--
Gitblit v1.8.0