From 815a9b04ef7e3df21d8b679376603b335656f5e8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 30 四月 2025 17:09:52 +0800
Subject: [PATCH] 订单下发,订单下发定时任务处理

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

diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 6c43d09..f5c8a70 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -162,6 +162,44 @@
         p.yw_person_name
         ORDER BY wo.work_order_no DESC
     </select>
+    <select id="distributeList" resultMap="com.ycl.platform.domain.vo.WorkOrderVO">
+        SELECT
+            wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result,
+            wo.yw_check_result, wo.overtime, wo.deduct,
+            u.unit_name,
+            p.yw_person_name,
+            yp.serial_number,
+            yp.important_tag,
+            yp.important_command_image_tag,
+            odr.create_time as distributeTime,
+            su.nick_name as realName,
+            tm.name as source,
+            GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR '銆�') AS errorType
+        FROM
+            t_work_order wo
+                INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+                INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
+                INNER JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
+                INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+                INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
+                LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
+                LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_no = wo.work_order_no AND odr.deleted = 0
+                LEFT JOIN sys_user su ON su.user_id = odr.user_id
+        WHERE
+            wo.deleted = 0
+          AND wo.create_time BETWEEN #{startDate} AND #{endDate}
+        GROUP BY
+            wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time,
+            wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+            u.unit_name,
+            p.yw_person_name,
+            yp.important_tag,
+            yp.important_command_image_tag,
+            odr.create_time,
+            su.nick_name
+        ORDER BY wo.create_time DESC
+    </select>
+
     <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
         SELECT
         wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result,

--
Gitblit v1.8.0