From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml | 84 +++++++++--------------------------------
1 files changed, 19 insertions(+), 65 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
index ab958b1..79969c8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -27,85 +27,39 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="selectFwEffectEvalPage" resultMap="fwEffectEvalResultMap">
- select * from ja_fw_effect_eval
+ select
+ *
+ from
+ ja_fw_effect_eval
<where>
is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and id = #{param2.id}
- </if>
- <if test="param2.alarmRecordId != null and param2.alarmRecordId != ''">
- and alarm_record_id = #{param2.alarmRecordId}
- </if>
- <if test="param2.deviceId != null and param2.deviceId != ''">
- and device_id = #{param2.deviceId}
- </if>
- <if test="param2.deviceSn != null and param2.deviceSn != ''">
- and device_sn = #{param2.deviceSn}
- </if>
<if test="param2.deviceName != null and param2.deviceName != ''">
- and device_name = #{param2.deviceName}
- </if>
- <if test="param2.deviceModel != null and param2.deviceModel != ''">
- and device_model = #{param2.deviceModel}
+ and device_name like concat('%', #{param2.deviceName}, '%')
</if>
<if test="param2.deviceType != null and param2.deviceType != ''">
and device_type = #{param2.deviceType}
</if>
- <if test="param2.droneName != null and param2.droneName != ''">
- and drone_name = #{param2.droneName}
- </if>
- <if test="param2.droneType != null and param2.droneType != ''">
- and drone_type = #{param2.droneType}
- </if>
- <if test="param2.droneDeviceCode != null and param2.droneDeviceCode != ''">
- and drone_device_code = #{param2.droneDeviceCode}
- </if>
- <if test="param2.findTime != null and param2.findTime != ''">
- and find_time = #{param2.findTime}
- </if>
<if test="param2.counterEffect != null and param2.counterEffect != ''">
and counter_effect = #{param2.counterEffect}
</if>
- <if test="param2.deployLongitude != null and param2.deployLongitude != ''">
- and deploy_longitude = #{param2.deployLongitude}
- </if>
- <if test="param2.deployLatitude != null and param2.deployLatitude != ''">
- and deploy_latitude = #{param2.deployLatitude}
- </if>
- <if test="param2.coverRadiusM != null and param2.coverRadiusM != ''">
- and cover_radius_m = #{param2.coverRadiusM}
- </if>
- <if test="param2.workMode != null and param2.workMode != ''">
- and work_mode = #{param2.workMode}
- </if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and area_code = #{param2.areaCode}
- </if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and create_user = #{param2.createUser}
- </if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and create_dept = #{param2.createDept}
- </if>
- <if test="param2.createTime != null and param2.createTime != ''">
- and create_time = #{param2.createTime}
- </if>
- <if test="param2.updateUser != null and param2.updateUser != ''">
- and update_user = #{param2.updateUser}
- </if>
- <if test="param2.updateTime != null and param2.updateTime != ''">
- and update_time = #{param2.updateTime}
- </if>
- <if test="param2.status != null and param2.status != ''">
- and status = #{param2.status}
- </if>
- <if test="param2.isDeleted != null and param2.isDeleted != ''">
- and is_deleted = #{param2.isDeleted}
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and (create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ <!-- 或者设备是共享给当前部门的 -->
+ <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
+ or device_id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{param2.currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
</if>
</where>
</select>
--
Gitblit v1.9.3