From 31d3591b34d4f26ad2ab207ca3044048d9adb9df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index f07833f..5445a93 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -47,7 +47,9 @@
wo.*,
u.unit_name,
p.yw_person_name,
- yp.point_tag,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag,
odr.create_time as distributeTime,
su.nick_name as realName
FROM
@@ -72,7 +74,9 @@
SELECT
wo.id,
wod.create_time,
- yp.point_tag
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag
FROM
t_work_order wo
INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
@@ -139,17 +143,42 @@
</if>
</select>
- <select id="workOrderTotal" resultType="java.util.Map">
+ <select id="workOrderTotal" resultType="com.ycl.platform.domain.vo.screen.WorkOrderTotalVO">
SELECT
COUNT(*) AS totalNum,
- COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
- COUNT(IF(status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(status = 'AUDITING', 1, NULL)) AS doneNum
+ COUNT(IF(w.status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(w.status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
+ COUNT(IF(w.status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(w.status = 'AUDITING', 1, NULL)) AS doneNum
FROM t_work_order w
+ LEFT JOIN t_yw_point p ON w.serial_number = p.serial_number AND p.deleted = 0
WHERE w.deleted = 0
+ <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
+ <if test="deptId != null"> AND p.dept_id = #{deptId} </if>
</select>
- <select id="workOrderRegion" resultType="java.util.Map">
- SELECT * FROM t_work_order limit 1
+ <select id="workOrderRegion" resultType="com.ycl.platform.domain.vo.screen.WorkOrderRegionVO">
+ SELECT
+ d.area,
+ COUNT(IF(w.status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(w.status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
+ COUNT(IF(w.status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(w.status = 'AUDITING', 1, NULL)) AS doneNum
+ FROM
+ sys_dept d
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0
+ LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
+ WHERE d.del_flag = 0 AND d.area IS NOT NULL
+ <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
+ <if test="deptId != null"> AND p.dept_id = #{deptId} </if>
+ GROUP BY d.area, d.dept_id
+ ORDER BY d.dept_id
+ </select>
+
+ <select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
+ SELECT
+ wo.id as workOrderId,
+ di.device_id,
+ di.channel_id
+ FROM
+ t_work_order wo
+ INNER JOIN t_device_info di ON wo.serial_number = di.device_id
</select>
</mapper>
--
Gitblit v1.8.0