From 9606980aa32de18b4fc1cb7e3450b90c636cbf84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 10 十月 2024 18:14:10 +0800
Subject: [PATCH] 取图片依赖注释

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

diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index b650439..2f7f2d2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -63,19 +63,67 @@
             AND wo.unit_id = #{query.unitId}
         </if>
         <if test="query.keyword != null and query.keyword != ''">
-            AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%'))
+            AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%') or wo.serial_number like concat('%', #{query.keyword}, '%'))
         </if>
         <if test="query.status != null and query.status != ''">
             AND wo.status = #{query.status}
         </if>
-        <if test="query.start != null">
-            AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
+        <if test="query.start != null and query.end != null">
+            AND wo.create_time BETWEEN #{query.start} AND #{query.end}
         </if>
         GROUP BY
         wo.id, wo.status, wo.work_order_no, wo.serial_number,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
-        ORDER BY wo.create_time DESC
+        ORDER BY wo.work_order_no DESC
+    </select>
+
+    <select id="export" resultMap="BaseResultMap">
+        SELECT
+        wo.id,wo.status,
+        wo.work_order_no,
+        wo.serial_number,
+        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,
+        tm.name as source,
+        GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType,
+        GROUP_CONCAT(DISTINCT ci.img_url ORDER BY ci.create_time DESC SEPARATOR ',') AS imgListStr
+        FROM
+        t_work_order wo
+        INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+        INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+        INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
+        INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
+            collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
+        LEFT JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no
+        LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
+        WHERE
+        wo.deleted = 0
+        <if test="query.unitId != null">
+            AND wo.unit_id = #{query.unitId}
+        </if>
+        <if test="query.keyword != null and query.keyword != ''">
+            AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%'))
+        </if>
+        <if test="query.status != null and query.status != ''">
+            AND wo.status = #{query.status}
+        </if>
+        <if test="query.start != null and query.end != null">
+            AND wo.create_time BETWEEN #{query.start} AND #{query.end}
+        </if>
+        GROUP BY
+        wo.id, wo.status, wo.work_order_no, wo.serial_number,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
+        ORDER BY wo.work_order_no DESC
     </select>
 
     <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
@@ -209,7 +257,7 @@
         LEFT JOIN t_yw_point p ON w.serial_number = p.serial_number AND p.deleted = 0
         WHERE w.deleted = 0
         <if test="dataScope == 1"> AND p.province_tag = 1 </if>
-        <if test="dataScope == 3"> AND p.important_tag = 1 </if>
+        <if test="dataScope == 3"> AND p.dept_tag = 1 </if>
         <if test="deptId != null"> AND p.dept_id = #{deptId} </if>
     </select>
 
@@ -224,10 +272,10 @@
         LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
         WHERE d.del_flag = 0 AND d.area IS NOT NULL
         <if test="dataScope == 1"> AND p.province_tag = 1 </if>
-        <if test="dataScope == 3"> AND p.important_tag = 1 </if>
+        <if test="dataScope == 3"> AND p.dept_tag = 1 </if>
         <!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
         GROUP BY d.area, d.dept_id
-        ORDER BY d.dept_id
+        ORDER BY d.area_code
     </select>
 
     <select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
@@ -238,8 +286,8 @@
         FROM
              t_work_order wo
         WHERE
-            wo.create_time BETWEEN #{start} AND #{end} AND wo.status = 'AUDITING'
-            AND deleted = 0
+            wo.status = 'YW_HANDLE'
+            AND wo.deleted = 0
     </select>
 
     <insert id="addMany">

--
Gitblit v1.8.0