From 35d325f87d78d942d78a538dd36d5317f0876313 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 15 十月 2024 19:03:55 +0800
Subject: [PATCH] 异常恢复的统计数bug
---
ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 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 7908573..159fc09 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -33,18 +33,26 @@
where id = #{id}
</select>
- <select id="workList" resultType="com.ycl.platform.domain.vo.YwUnitVO">
+ <select id="workList" resultType="integer">
SELECT
- a.*,
- COUNT(b.id) AS work_order_count
+ count(DISTINCT wo.id)
FROM
- t_yw_unit a
- LEFT JOIN
- t_work_order b ON a.id = b.unit_id AND b.deleted = 0 AND b.status = 'WAIT_DISTRIBUTE'
+ 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
- a.deleted = 0
- GROUP BY
- a.id;
+ wo.unit_id = #{query.unitId} AND 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>
</select>
<insert id="insertYwUnit" parameterType="YwUnit" useGeneratedKeys="true" keyProperty="id">
@@ -99,4 +107,26 @@
#{id}
</foreach>
</delete>
+
+ <select id="getByUserId" resultMap="YwUnitResult">
+ SELECT
+ tyw.*
+ FROM
+ t_yw_unit tyw
+ INNER JOIN t_unit_people tup ON tup.unit_id = tyw.id and tyw.deleted = 0
+ INNER JOIN t_yw_people typ ON tup.yw_people_id = typ.id AND typ.user_id = #{userId} AND typ.deleted = 0
+ </select>
+
+ <select id="ywUnitCount" resultType="java.util.Map">
+ SELECT
+ u.unit_name AS name,
+ 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