From cc623a1a25fe1861fbeaba79a76bfc29724141f9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 14:52:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
index 21f0424..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">
@@ -112,11 +130,13 @@
<select id="ywUnitCount" resultType="java.util.Map">
SELECT
u.unit_name AS name,
- COUNT(tcs.id) AS num
+ COUNT(tcs.id) AS num,
+ 100 - SUM(score) AS score
FROM
t_contract_score tcs
LEFT JOIN t_yw_unit u ON tcs.unit_id = u.id
WHERE tcs.deleted = 0
GROUP BY tcs.unit_id
+ ORDER BY score DESC
</select>
</mapper>
--
Gitblit v1.8.0