From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
index c5e9548..76715bb 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
@@ -10,7 +10,6 @@
<result column="maintain_time" property="maintainTime"/>
<result column="maintain_content" property="maintainContent"/>
<result column="replace_part" property="replacePart"/>
- <result column="maintain_result" property="maintainResult"/>
<result column="remark" property="remark"/>
<result column="area_code" property="areaCode"/>
<result column="create_user" property="createUser"/>
@@ -22,9 +21,31 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <select id="selectLastOne" resultType="org.sxkj.fw.device.vo.FwDeviceMaintainRecordVO">
+ select * from ja_fw_device_maintain_record
+ where is_deleted = 0 and plan_id = #{planId}
+ </select>
- <select id="selectFwDeviceMaintainRecordPage" resultMap="fwDeviceMaintainRecordResultMap">
- select * from ja_fw_device_maintain_record where is_deleted = 0
+ <select id="selectFwDeviceMaintainRecordPage" resultType="org.sxkj.fw.device.vo.FwDeviceMaintainRecordVO">
+ select * from ja_fw_device_maintain_record
+ <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.planId != null and param2.planId != ''">
+ and plan_id = #{param2.planId}
+ </if>
+ <if test="param2.maintainTime != null and param2.maintainTime != ''">
+ and maintain_time = #{param2.maintainTime}
+ </if>
+ <if test="param2.maintainContent != null and param2.maintainContent != ''">
+ and maintain_content = #{param2.maintainContent}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3