From a2813f7399cb27e6f66e99b5d9577eb21f4ddac3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 12:24:42 +0800
Subject: [PATCH] 下发页面运维单位工单数查询优化

---
 ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml                    |   34 ++++++++++++++++++++++++++--------
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java |    6 ++++--
 ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java          |    3 ++-
 ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java    |    5 +++--
 ycl-server/src/main/java/com/ycl/platform/mapper/YwUnitMapper.java            |    4 +++-
 5 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
index b74d527..580ecc0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -1,5 +1,6 @@
 package com.ycl.platform.controller;
 
+import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
 import com.ycl.platform.domain.query.ReportQuery;
 import com.ycl.platform.domain.vo.ReportVO;
 import com.ycl.platform.domain.vo.YwUnitVO;
@@ -83,8 +84,8 @@
 
     @GetMapping("/work/list")
     @ApiOperation(value = "宸ュ崟鍒楄〃", notes = "宸ュ崟鍒楄〃")
-    public Result workList() {
-        return ywUnitService.workList();
+    public Result workList(DistributeWorkOrderQuery query) {
+        return ywUnitService.workList(query);
     }
 
     @PostMapping("/export")
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwUnitMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwUnitMapper.java
index 603ee0c..ef28967 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwUnitMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwUnitMapper.java
@@ -4,8 +4,10 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
 import com.ycl.platform.domain.vo.YwUnitVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -23,7 +25,7 @@
      * 杩愮淮鍗曚綅鍒楄〃缁熻
      * @return 鏁版嵁
      */
-    List<YwUnitVO> workList();
+    List<YwUnitVO> workList(@Param("query") DistributeWorkOrderQuery query);
 
     /**
      * 閫氳繃鐢ㄦ埛ID鏌ユ壘杩愮淮鍗曚綅
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java
index b4e77fa..39755ea 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ycl.platform.domain.entity.YwUnit;
 import com.ycl.platform.domain.form.YwUnitForm;
+import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
 import com.ycl.platform.domain.query.YwUnitQuery;
 import com.ycl.platform.domain.vo.YwUnitVO;
 import com.ycl.system.Result;
@@ -77,7 +78,7 @@
      * 鍒楄〃
      * @return
      */
-    Result workList();
+    Result workList(DistributeWorkOrderQuery query);
 
     /**
      * 璁剧疆鐧诲綍鐢ㄦ埛鐨勮繍缁村崟浣嶄俊鎭�
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 1fc62ca..401cd20 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -7,6 +7,7 @@
 import com.ycl.platform.base.BaseSelect;
 import com.ycl.platform.domain.entity.YwUnit;
 import com.ycl.platform.domain.form.YwUnitForm;
+import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
 import com.ycl.platform.domain.query.YwUnitQuery;
 import com.ycl.platform.domain.vo.YwUnitVO;
 import com.ycl.platform.mapper.YwUnitMapper;
@@ -23,6 +24,7 @@
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.SecurityUtils;
 import lombok.RequiredArgsConstructor;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -211,8 +213,8 @@
     }
 
     @Override
-    public Result workList() {
-        List<YwUnitVO> entities = baseMapper.workList();
+    public Result workList(DistributeWorkOrderQuery query) {
+        List<YwUnitVO> entities = baseMapper.workList(query);
         return Result.ok().data(entities);
     }
 
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
index 9df4474..8c06409 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -35,16 +35,34 @@
 
     <select id="workList" resultType="com.ycl.platform.domain.vo.YwUnitVO">
         SELECT
-            a.*,
-            COUNT(b.id) AS work_order_count
+               u.id AS id, u.unit_name, count(DISTINCT wot.id) AS work_order_count
         FROM
-            t_yw_unit a
+            t_yw_unit u
                 LEFT JOIN
-            t_work_order b ON a.id = b.unit_id AND b.deleted = 0 AND b.status = 'WAIT_DISTRIBUTE'
-        WHERE
-            a.deleted = 0
-        GROUP BY
-            a.id;
+             (
+                SELECT
+                    wo.id,
+                    wo.unit_id
+                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_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.status != null and query.status != ''">
+                        AND wo.status = #{query.status}
+                    </if>
+                    <if test="query.keyword != null and query.keyword != ''">
+                        AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword}, '%'))
+                    </if>
+                ) as wot ON wot.unit_id = u.id
+        WHERE u.deleted = 0
+                group by u.id
     </select>
 
     <insert id="insertYwUnit" parameterType="YwUnit" useGeneratedKeys="true" keyProperty="id">

--
Gitblit v1.8.0