From eb8c2e062f554aa250d660ac798cdb1de7eeeb99 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 12 十二月 2024 00:14:15 +0800
Subject: [PATCH] 首页抓拍量按钮
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 1b74f97..783bf1f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -149,7 +149,6 @@
p.yw_person_name
ORDER BY wo.work_order_no DESC
</select>
-
<select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
SELECT
wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result,
@@ -157,7 +156,6 @@
u.unit_name,
p.yw_person_name,
yp.serial_number,
- yp.province_tag,
yp.important_tag,
yp.important_command_image_tag,
odr.create_time as distributeTime,
@@ -205,19 +203,28 @@
wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
u.unit_name,
p.yw_person_name,
- yp.province_tag,
yp.important_tag,
yp.important_command_image_tag,
odr.create_time,
su.nick_name
ORDER BY wo.create_time DESC
</select>
-
+ <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
+ where wo.status != 'AUDITING_SUCCESS' and wo.deleted = 0
+ AND (EXISTS(
+ SELECT 1
+ FROM t_work_order_error_type twoet
+ WHERE twoet.work_order_no = wo.work_order_no
+ AND twoet.error_name = 'DEVICEOFFLINE'
+ ))
+ </select>
<select id="handlingWorkOrderList" resultType="com.ycl.platform.domain.vo.YwPointJobVO">
SELECT
wo.id,
wod.create_time,
- yp.province_tag,
yp.important_tag,
yp.important_command_image_tag
FROM
@@ -294,7 +301,7 @@
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 = 1 </if>
+ <if test="dataScope == 1"> AND (p.province_tag_video = 1 or p.province_tag_car = 1 or p.province_tag_face = 1)</if>
<if test="dataScope == 3"> AND p.dept_tag = 1 </if>
<if test="deptId != null"> AND p.dept_id = #{deptId} </if>
</select>
@@ -309,7 +316,7 @@
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 = 1 </if>
+ <if test="dataScope == 1"> AND (p.province_tag_video = 1 or p.province_tag_car = 1 or p.province_tag_face = 1)</if>
<if test="dataScope == 3"> AND p.dept_tag = 1 </if>
<!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
GROUP BY d.area, d.dept_id
@@ -324,7 +331,7 @@
FROM
t_work_order wo
WHERE
- wo.status = 'YW_HANDLE'
+ (wo.status = 'YW_HANDLE' or wo.status ='DISTRIBUTED' )
AND wo.deleted = 0
</select>
--
Gitblit v1.8.0