From 60c2c06c064008586dece2762fcaeb90b8d739be Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 16:38:29 +0800
Subject: [PATCH] 点位导入优化
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 2576775..a77527e 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
@@ -162,9 +166,19 @@
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>
+ <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