From 0b8a348d0b978eeddfa3995b87cd11f7cbdd48a9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 23 八月 2024 17:42:05 +0800
Subject: [PATCH] 工单查询优化

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml                    |   60 ++++++++++++++++-------------
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java               |    1 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |    7 +++
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java         |    3 +
 4 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index 4aca3dc..7ad69ca 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -8,6 +8,7 @@
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 宸ュ崟鏌ヨ
@@ -40,7 +41,7 @@
     /**
      * 鏁呴殰绫诲瀷
      */
-    private String errorType;
+    private List<String> errorTypeList;
 
     /**
      * 鐘舵��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index 3ac3500..88b0e63 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -55,6 +55,7 @@
 
     /** 鏁呴殰绫诲瀷 */
     private List<String> errorTypeList;
+    private String errorType;
 
     /** 杩愮淮浜哄憳 */
     private Integer ywPeopleId;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index f763df1..8331f28 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -429,6 +429,13 @@
     public Result page(WorkOrderQuery query) {
         IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
         baseMapper.page(page, query);
+        if (! CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().stream().forEach(item -> {
+                if (StringUtils.hasText(item.getErrorType())) {
+                    item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+                }
+            });
+        }
         return Result.ok().data(page.getRecords()).total(page.getTotal());
     }
 
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 4111b0c..c51e86a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -11,45 +11,51 @@
         <result column="yw_people_id" property="ywPeopleId"/>
         <result column="yw_handle_time" property="ywHandleTime"/>
         <result column="yw_result" property="ywResult"/>
-        <result column="yw_condition" property="ywCondition"/>
         <result column="yw_check_result" property="ywCheckResult"/>
         <result column="overtime" property="overtime"/>
         <result column="deduct" property="deduct"/>
-        <collection property="errorTypeList" select="getErrorType" ofType="string" column="work_order_no">
-        </collection>
+        <result column="errorType" property="errorType"/>
+<!--        <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>-->
     </resultMap>
 
     <select id="getErrorType" resultType="string">
         SELECT DISTINCT da.dict_label
         FROM
             t_work_order_error_type et
-                 LEFT JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
-        WHERE et.work_order_no = #{work_order_no}
+                 LEFT JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="errList != null and errList.size() > 0">AND da.dict_value in <foreach
+            collection="errList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
+        WHERE et.work_order_no = #{workOrderNo}
     </select>
 
     <select id="page" resultMap="BaseResultMap">
         SELECT
-            wo.*,
-            u.unit_name,
-            p.yw_person_name
+        wo.id,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,
+        GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
         FROM
-            t_work_order wo
-        LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
-        LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
-        where
-            wo.deleted = 0
-            <if test="query.workOrderNo != null and query.workOrderNo != ''">
-                AND wo.work_order_no = #{query.workOrderNo}
-            </if>
-            <if test="query.status != null">
-                AND wo.status = #{query.status}
-            </if>
-            <if test="query.errorType != null and query.errorType != ''">
-                AND wo.error_type = #{query.errorType}
-            </if>
-            <if test="query.start != null">
-                AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
-            </if>
+        t_work_order wo
+        LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
+        LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.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' <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>
+        WHERE
+        wo.deleted = 0
+        <if test="query.workOrderNo != null and query.workOrderNo != ''">
+            AND wo.work_order_no = #{query.workOrderNo}
+        </if>
+        <if test="query.status != null">
+            AND wo.status = #{query.status}
+        </if>
+        <!-- 娉ㄦ剰锛氳繖閲岀Щ闄や簡瀵筿uery.errorType鐨勭洿鎺ユ煡璇紝鍥犱负瀹冪幇鍦ㄩ�氳繃JOIN鍜孏ROUP_CONCAT澶勭悊 -->
+        <if test="query.start != null">
+            AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
+        </if>
+        GROUP BY
+        wo.id,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
         ORDER BY wo.create_time DESC
     </select>
 
@@ -68,7 +74,7 @@
                 LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
                 LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
                 INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
-                LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_id = wo.id AND odr.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
@@ -91,7 +97,7 @@
         FROM
              t_work_order wo
                 INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
-                INNER JOIN t_work_order_distribute_record wod ON wod.work_order_id = wo.id
+                INNER JOIN t_work_order_distribute_record wod ON wod.work_order_no = wo.work_order_no
         WHERE
              wo.status = 'DISTRIBUTED' AND wo.deleted = 0
     </select>

--
Gitblit v1.8.0