From a9e60d55e3e8d0c5c84c6678911ee8131491fc45 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 01 八月 2024 10:54:38 +0800
Subject: [PATCH] feat：考核结果
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 460ec85..8faab75 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -37,19 +37,18 @@
<result property="hybm" column="hybm" />
<result property="lxbm" column="lxbm" />
<result property="reason" column="reason" />
- <result property="defaultOrder" column="default_order" />
<result property="recovery" column="recovery" />
<result property="recoveryTime" column="recovery_time" />
<result property="deptId" column="dept_id" />
</resultMap>
<sql id="selectTMonitorVo">
- 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,dept_id from t_monitor
+ 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, recovery,recovery_time,dept_id from t_monitor
</sql>
<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,d.dept_name from t_monitor m
+ , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, 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>
@@ -83,7 +82,6 @@
<if test="hybm != null and hybm != ''"> and hybm = #{hybm}</if>
<if test="lxbm != null "> and lxbm = #{lxbm}</if>
<if test="reason != null and reason != ''"> and reason = #{reason}</if>
- <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 m.dept_id = #{deptId}</if>
@@ -130,7 +128,6 @@
<if test="hybm != null">hybm,</if>
<if test="lxbm != null">lxbm,</if>
<if test="reason != null">reason,</if>
- <if test="defaultOrder != null">default_order,</if>
<if test="recovery != null">recovery,</if>
<if test="recoveryTime != null">recovery_time,</if>
<if test="deptId != null">dept_id,</if>
@@ -167,7 +164,6 @@
<if test="hybm != null">#{hybm},</if>
<if test="lxbm != null">#{lxbm},</if>
<if test="reason != null">#{reason},</if>
- <if test="defaultOrder != null">#{defaultOrder},</if>
<if test="recovery != null">#{recovery},</if>
<if test="recoveryTime != null">#{recoveryTime},</if>
<if test="deptId != null">#{deptId},</if>
@@ -208,8 +204,6 @@
<if test="hybm != null">hybm = #{hybm},</if>
<if test="lxbm != null">lxbm = #{lxbm},</if>
<if test="reason != null">reason = #{reason},</if>
- <if test="defaultOrder != null">default_order = #{defaultOrder},</if>
- <if test="recovery != null">recovery = #{defaultOrder},</if>
<if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
</trim>
@@ -231,7 +225,6 @@
SELECT count(*) AS totalPosts,
IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
- IFNULL(SUM(IF(default_order = 1, 1, 0)), 0) AS totalViews,
-1 as noStore,
-1 as partStore,
IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage,
@@ -249,7 +242,6 @@
SELECT count(*) AS totalPosts,
IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
- IFNULL(SUM(IF(default_order = 1, 1, 0)), 0) AS totalViews,
IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
FROM t_monitor
WHERE recovery = 1
--
Gitblit v1.8.0