From 7b73755e320f1bec9254b86a0f078c5f7969880d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 19 十二月 2024 10:06:47 +0800
Subject: [PATCH] 接入海康成绩
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 13 ++++++++++---
1 files changed, 10 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 783bf1f..4f2c8b9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -92,7 +92,7 @@
ORDER BY wo.work_order_no DESC
</select>
- <select id="export" resultMap="BaseResultMap">
+ <select id="export" resultType = "com.ycl.platform.domain.vo.WorkOrderVO">
SELECT
wo.id,wo.status,
wo.work_order_no,
@@ -111,11 +111,18 @@
p.yw_person_name,
tm.name as source,
tm.ip as ip,
+ yp.province_tag_video,
+ yp.province_tag_car,
+ yp.province_tag_face,
+ yp.important_tag,
+ yp.important_command_image_tag,
+ yp.dept_tag,
GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType,
GROUP_CONCAT(DISTINCT ci.img_url ORDER BY ci.create_time DESC SEPARATOR ',') AS imgListStr
FROM
t_work_order wo
INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+ INNER JOIN t_yw_point yp ON wo.serial_number = yp.serial_number
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'
INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
@@ -212,9 +219,9 @@
<select id="getOfflineWorkOrder" resultType="java.lang.String">
select tm.ip
FROM t_work_order wo
- INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
where wo.status != 'AUDITING_SUCCESS' and wo.deleted = 0
- AND (EXISTS(
+ AND (EXISTS (
SELECT 1
FROM t_work_order_error_type twoet
WHERE twoet.work_order_no = wo.work_order_no
--
Gitblit v1.8.0