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/CheckIndexCarMapper.xml | 95 +++++++++++++++++++++++++++++++++++------------
1 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
index ae68374..3ec6730 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
@@ -10,6 +10,7 @@
<result property="examineTag" column="examine_tag" />
<result property="createTime" column="create_time" />
<result property="score" column="score" />
+ <result property="num" column="num" />
<result property="viewConnectStability" column="view_connect_stability" />
<result property="siteOnline" column="site_online" />
<result property="deviceDirectoryConsistent" column="device_directory_consistent" />
@@ -27,13 +28,20 @@
</sql>
<select id="selectCheckIndexCarList" resultMap="CheckIndexCarResult">
- select tcic.*,sd.dept_name,tcs.score
+ select tcic.*,sd.dept_name,tcs.score,count(m.serial_number) as num
from t_check_index_car tcic left join sys_dept sd on tcic.dept_id = sd.dept_id
left join t_check_score tcs on tcic.id = tcs.index_id
+ left join t_yw_point p on p.dept_id = tcic.dept_id and p.examine_status = 1
+ left join t_monitor m on p.serial_number = m.serial_number
<where>
- tcs.examine_category = 2
+ tcs.examine_category = 2 and m.camera_fun_type like concat('%',2,'%')
<if test="deptId != null "> and tcic.dept_id = #{deptId}</if>
<if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</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(tcic.create_time,'%Y-%m') = #{date}</if>
<if test="day != null "> and date(tcic.create_time) = #{day}</if>
<if test="params.publish != null and params.publish != ''">and tcic.publish = #{params.publish}</if>
@@ -42,19 +50,14 @@
#{deptId}
</foreach>
</if>
- <if test="examineTags != null and examineTags.size()>0">and tcic.examine_tag in
- <foreach collection="examineTags" separator="," open="(" close=")" item="examineTag">
- #{examineTag}
- </foreach>
- </if>
</where>
- order by tcic.examine_tag desc,tcic.create_time,tcs.score desc
+ group by tcic.id
+ order by tcic.examine_tag desc,sd.area_code,tcic.create_time
</select>
<select id="getCheckIndexCarList" resultMap="CheckIndexCarResult">
select tcic.*,sd.dept_name
from t_check_index_car tcic left join sys_dept sd on tcic.dept_id = sd.dept_id
- left join t_check_score tcs on tcic.id = tcs.index_id
<where>
<if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</if>
<if test="day != null "> and date(tcic.create_time) = #{day}</if>
@@ -140,34 +143,78 @@
</select>
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexCar">
- SELECT
- IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
- IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
- IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
- IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy,
- IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity,
- IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy,
- IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy,
- IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness,
- IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability,
- IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability
- FROM
- t_check_index_car
+<!-- SELECT-->
+<!-- IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,-->
+<!-- IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,-->
+<!-- IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,-->
+<!-- IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy,-->
+<!-- IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity,-->
+<!-- IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy,-->
+<!-- IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy,-->
+<!-- IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness,-->
+<!-- IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability,-->
+<!-- IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability-->
+<!-- FROM-->
+<!-- t_check_index_car-->
+<!-- <where>-->
+<!-- <if test="deptId != null">-->
+<!-- AND dept_id = #{deptId}-->
+<!-- </if>-->
+<!-- <if test="dataScope == 1">-->
+<!-- AND examine_tag = 0-->
+<!-- </if>-->
+<!-- <if test="dataScope == 2">-->
+<!-- AND examine_tag = 1-->
+<!-- </if>-->
+<!-- <if test="dataScope == 3">-->
+<!-- AND examine_tag = 2-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- ORDER BY-->
+<!-- create_time DESC-->
+<!-- <if test="deptId == null">-->
+<!-- LIMIT 7-->
+<!-- </if>-->
+<!-- <if test="deptId != null">-->
+<!-- LIMIT 1-->
+<!-- </if>-->
+ WITH LatestRecords AS (
+ SELECT *
+ FROM t_check_index_car
<where>
<if test="deptId != null">
AND dept_id = #{deptId}
</if>
<if test="dataScope == 1">
+ AND examine_tag = 0
+ </if>
+ <if test="dataScope == 2">
AND examine_tag = 1
</if>
+ <if test="dataScope == 3">
+ AND examine_tag = 2
+ </if>
</where>
- ORDER BY
- create_time DESC
+ ORDER BY create_time DESC
<if test="deptId == null">
LIMIT 7
</if>
<if test="deptId != null">
LIMIT 1
</if>
+ )
+ SELECT
+ IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
+ IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
+ IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
+ IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy,
+ IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity,
+ IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy,
+ IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy,
+ IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness,
+ IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability,
+ IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability
+ FROM
+ LatestRecords;
</select>
</mapper>
--
Gitblit v1.8.0