From d7d86983eba8463558a1d9ddd2388a3fece7dfe1 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Fri, 09 Jan 2026 14:51:45 +0800
Subject: [PATCH] add-反无大屏-基础管理-设备报废记录相关

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml |   62 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
index 480af0f..4efe501 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -4,11 +4,71 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="fwDefenseZoneResultMap" type="org.sxkj.fw.area.entity.FwDefenseZoneEntity">
+        <result column="id" property="id"/>
+        <result column="zone_name" property="zoneName"/>
+        <result column="zone_area" property="zoneArea"/>
+        <result column="defense_scene_ids" property="defenseSceneIds"/>
+        <result column="area_divide_ids" property="areaDivideIds"/>
+        <result column="device_ids" property="deviceIds"/>
+        <result column="geom" property="geom"/>
+        <result column="area_code" property="areaCode"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <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="selectFwDefenseZonePage" resultMap="fwDefenseZoneResultMap">
-        select * from ja_fw_defense_zone where is_deleted = 0
+        select * from ja_fw_defense_zone
+        <where>
+            is_deleted = 0
+            <if test="param2.id != null and param2.id != ''">
+                and id = #{param2.id}
+            </if>
+            <if test="param2.zoneName != null and param2.zoneName != ''">
+                and zone_name like concat('%', #{param2.zoneName}, '%')
+            </if>
+            <if test="param2.zoneArea != null and param2.zoneArea != ''">
+                and zone_area = #{param2.zoneArea}
+            </if>
+            <if test="param2.defenseSceneIds != null and param2.defenseSceneIds != ''">
+                and defense_scene_ids = #{param2.defenseSceneIds}
+            </if>
+            <if test="param2.areaDivideIds != null and param2.areaDivideIds != ''">
+                and area_divide_ids = #{param2.areaDivideIds}
+            </if>
+            <if test="param2.deviceIds != null and param2.deviceIds != ''">
+                and device_ids = #{param2.deviceIds}
+            </if>
+            <if test="param2.geom != null and param2.geom != ''">
+                and geom = #{param2.geom}
+            </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>
+        </where>
     </select>
 
 

--
Gitblit v1.9.3