From 8c21633f241b9a1c02cd246544928da9b6089040 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 31 七月 2024 18:16:53 +0800
Subject: [PATCH] feat：考核结果明细
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index e75c2f6..460ec85 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -49,8 +49,8 @@
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days
- , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,sd.dept_name from t_monitor m
- left join sys_dept sd on m.dept_id = sd.dept_id
+ , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,d.dept_name from t_monitor m
+ left join sys_dept d on m.dept_id = d.dept_id
<where>
<if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -86,8 +86,9 @@
<if test="defaultOrder != null "> and default_order = #{defaultOrder}</if>
<if test="recovery != null "> and recovery = #{recovery}</if>
<if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <if test="deptId != null "> and m.dept_id = #{deptId}</if>
</where>
+ ${params.dataScope}
</select>
<select id="selectTMonitorById" parameterType="Long" resultMap="TMonitorResult">
@@ -236,8 +237,12 @@
IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage,
-1 as totalFace,
-1 as totalCar
- FROM t_monitor
- WHERE camera_fun_type like concat('%', #{cameraFunType}, '%')
+ FROM t_monitor m
+ left join sys_dept d on m.dept_id = d.dept_id
+ <where>
+ camera_fun_type like concat('%', #{cameraFunType}, '%')
+ </where>
+ ${params.dataScope}
</select>
<select id="recoveryException" resultType="java.util.Map">
@@ -249,4 +254,5 @@
FROM t_monitor
WHERE recovery = 1
</select>
+
</mapper>
--
Gitblit v1.8.0