From b91945ea32378a71d1e57356af6e16703a1ceaa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 14:52:16 +0800
Subject: [PATCH] 工单只下发考核的、阈值bug

---
 ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
index baea4cf..fad7608 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
@@ -29,13 +29,17 @@
         select tcif.*,sd.dept_name,tcs.score,count(m.serial_number) as num
         from t_check_index_face tcif left join sys_dept sd on tcif.dept_id = sd.dept_id
         left join t_check_score tcs on tcif.id = tcs.index_id
-        left join t_yw_point p on p.dept_id = tcif.dept_id
+        left join t_yw_point p on p.dept_id = tcif.dept_id  and p.examine_status = 1
         left join t_monitor m on p.serial_number = m.serial_number
         <where>
             tcs.examine_category = 3 and m.camera_fun_type like concat('%',3,'%')
             <if test="deptId != null "> and tcif.dept_id = #{deptId}</if>
             <if test="examineTag != null "> and tcif.examine_tag = #{examineTag}</if>
-            <if test="examineTagQuery != null "> and p.province_tag = #{examineTagQuery}</if>
+            <if test="provinceTag != null "> and p.province_tag = #{provinceTag}</if>
+            <if test="deptTag != null "> and p.dept_tag = #{deptTag}</if>
+            <if test="quarter != null and quarter.size > 0">
+                and date_format(tcs.create_time, '%Y-%m') between #{quarter[0]} and #{quarter[1]}
+            </if>
             <if test="date != null "> and  date_format(tcif.create_time,'%Y-%m') = #{date}</if>
             <if test="day != null "> and  date(tcif.create_time) = #{day}</if>
             <if test="params.publish != null  and params.publish != ''">and tcif.publish = #{params.publish}</if>

--
Gitblit v1.8.0