From 083ac7646ef2ab4a2614678b158a3dce1482e75c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 05 十二月 2024 02:32:13 +0800 Subject: [PATCH] 省厅标签拆分 --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 7 ++++--- 1 files changed, 4 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 1b74f97..112848c 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -149,7 +149,7 @@ p.yw_person_name ORDER BY wo.work_order_no DESC </select> - + <!-- TODO --> <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, @@ -213,6 +213,7 @@ ORDER BY wo.create_time DESC </select> + <!-- TODO --> <select id="handlingWorkOrderList" resultType="com.ycl.platform.domain.vo.YwPointJobVO"> SELECT wo.id, @@ -294,7 +295,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 +310,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 -- Gitblit v1.8.0