From 51c2a670b6b7d031f2cd6ef6c5e8a77bf25df413 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:24:00 +0800
Subject: [PATCH] 记录优化

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 56 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
index a7868f5..03a8d5a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
@@ -4,11 +4,66 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="fwDeviceScrapResultMap" type="org.sxkj.fw.device.entity.FwDeviceScrapEntity">
+        <result column="id" property="id"/>
+        <result column="device_id" property="deviceId"/>
+        <result column="scrap_time" property="scrapTime"/>
+        <result column="scrap_reason" property="scrapReason"/>
+        <result column="dispose_way" property="disposeWay"/>
+        <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="selectFwDeviceScrapPage" resultMap="fwDeviceScrapResultMap">
-        select * from ja_fw_device_scrap where is_deleted = 0
+        select * from ja_fw_device_scrap
+        <where>
+            is_deleted = 0
+            <if test="param2.id != null and param2.id != ''">
+                and id = #{param2.id}
+            </if>
+            <if test="param2.deviceId != null and param2.deviceId != ''">
+                and device_id = #{param2.deviceId}
+            </if>
+            <if test="param2.scrapTime != null and param2.scrapTime != ''">
+                and scrap_time = #{param2.scrapTime}
+            </if>
+            <if test="param2.scrapReason != null and param2.scrapReason != ''">
+                and scrap_reason = #{param2.scrapReason}
+            </if>
+            <if test="param2.disposeWay != null and param2.disposeWay != ''">
+                and dispose_way = #{param2.disposeWay}
+            </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>
+        </where>
     </select>
 
 

--
Gitblit v1.9.3