From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
index 0564240..ae68374 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
@@ -9,6 +9,7 @@
<result property="deptId" column="dept_id" />
<result property="examineTag" column="examine_tag" />
<result property="createTime" column="create_time" />
+ <result property="score" column="score" />
<result property="viewConnectStability" column="view_connect_stability" />
<result property="siteOnline" column="site_online" />
<result property="deviceDirectoryConsistent" column="device_directory_consistent" />
@@ -26,31 +27,44 @@
</sql>
<select id="selectCheckIndexCarList" resultMap="CheckIndexCarResult">
- select tcic.*,sd.dept_name
+ select tcic.*,sd.dept_name,tcs.score
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>
+ tcs.examine_category = 2
<if test="deptId != null "> and tcic.dept_id = #{deptId}</if>
- <if test="examineTag != null "> and examine_tag = #{examineTag}</if>
+ <if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</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="viewConnectStability != null "> and view_connect_stability = #{viewConnectStability}</if>
- <if test="siteOnline != null "> and site_online = #{siteOnline}</if>
- <if test="deviceDirectoryConsistent != null "> and device_directory_consistent = #{deviceDirectoryConsistent}</if>
- <if test="vehicleInformationCollectionAccuracy != null "> and vehicle_information_collection_accuracy = #{vehicleInformationCollectionAccuracy}</if>
- <if test="vehicleCaptureIntegrity != null "> and vehicle_capture_integrity = #{vehicleCaptureIntegrity}</if>
- <if test="vehicleCaptureAccuracy != null "> and vehicle_capture_accuracy = #{vehicleCaptureAccuracy}</if>
- <if test="vehicleTimingAccuracy != null "> and vehicle_timing_accuracy = #{vehicleTimingAccuracy}</if>
- <if test="vehicleUploadTimeliness != null "> and vehicle_upload_timeliness = #{vehicleUploadTimeliness}</if>
- <if test="vehicleUrlAvailability != null "> and vehicle_url_availability = #{vehicleUrlAvailability}</if>
- <if test="vehiclePictureAvailability != null "> and vehicle_picture_availability = #{vehiclePictureAvailability}</if>
- <if test="deptIds != null ">and tcic.dept_id in
+ <if test="params.publish != null and params.publish != ''">and tcic.publish = #{params.publish}</if>
+ <if test="deptIds != null and deptIds.size()>0">and tcic.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{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
+ </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>
+ <if test="deptIds != null and deptIds.size()>0">and tcic.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
#{deptId}
</foreach>
</if>
</where>
</select>
-
<select id="selectCheckIndexCarById" resultMap="CheckIndexCarResult">
<include refid="selectCheckIndexCarVo"/>
where id = #{id}
--
Gitblit v1.8.0