From 10df3eebf12aa53fe2f66af2dc75fcd0ef12251c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 13 三月 2024 09:21:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 269e060..9fe7ef1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -40,14 +40,17 @@
<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 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, default_order,recovery,recovery_time,dept_id from t_monitor
</sql>
- <select id="selectTMonitorList" parameterType="com.ycl.platform.domain.entity.TMonitor" resultMap="TMonitorResult">
- <include refid="selectTMonitorVo"/>
+ <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
<where>
<if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -83,6 +86,7 @@
<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>
</where>
</select>
@@ -128,6 +132,7 @@
<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>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -164,6 +169,7 @@
<if test="defaultOrder != null">#{defaultOrder},</if>
<if test="recovery != null">#{recovery},</if>
<if test="recoveryTime != null">#{recoveryTime},</if>
+ <if test="deptId != null">#{deptId},</if>
</trim>
</insert>
@@ -204,6 +210,7 @@
<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>
where id = #{id}
</update>
--
Gitblit v1.8.0