From e56ecf1a502dfcac5bb6ef509a08164aee7c6154 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 07 十二月 2024 18:23:24 +0800
Subject: [PATCH] 新增白名单故障类型
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 12caa67..4eb03d6 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,7 +203,6 @@
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,
@@ -217,7 +214,6 @@
SELECT
wo.id,
wod.create_time,
- yp.province_tag,
yp.important_tag,
yp.important_command_image_tag
FROM
@@ -294,7 +290,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 +305,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
@@ -433,22 +429,15 @@
p.yw_person_name
</select>
- <select id="batchGetByError" resultType="com.ycl.platform.domain.entity.WorkOrder">
+ <select id="selectByNos" resultType="com.ycl.platform.domain.entity.WorkOrder">
select wo.id,wo.unit_id,wo.work_order_no,wo.serial_number
from t_work_order wo
<where>
wo.deleted = 0 and wo.status = 'YW_HANDLE'
- <if test="form.errorTypes != null and form.errorTypes.size() > 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 in
- <foreach collection="form.errorTypes" open="(" separator="," close=")" item="errorType">
- #{errorType}
- </foreach>
- ))
- </if>
+ and wo.work_order_no in
+ <foreach collection="workOrderNos" open="(" separator="," close=")" item="workOrderNo">
+ #{workOrderNo}
+ </foreach>
</where>
</select>
</mapper>
--
Gitblit v1.8.0