From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
index 5f3f169..159fc09 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -35,10 +35,10 @@
<select id="workList" resultType="integer">
SELECT
- count(*)
+ count(DISTINCT wo.id)
FROM
t_work_order wo
- INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number AND #{query.unitId}
+ 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'
@@ -46,7 +46,7 @@
collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>
</if>
WHERE
- wo.deleted = 0
+ wo.unit_id = #{query.unitId} AND wo.deleted = 0
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
</if>
--
Gitblit v1.8.0