From 8d5b8a8c1909be6cdca5228a01bdc017b85a4078 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:17 +0800
Subject: [PATCH] 处理Vo继承entity问题
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 ce55e69..5bf7bcd 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
@@ -18,10 +18,11 @@
<result column="manufacturer" property="manufacturer"/>
<result column="source" property="source"/>
<result column="purpose" property="purpose"/>
+ <result column="charger" property="charger"/>
+ <result column="device_create_time" property="createTime"/>
</resultMap>
- <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
- select
+ <sql id="deviceFields">
b.device_name,
b.device_type,
b.device_att,
@@ -31,7 +32,13 @@
b.manufacturer,
b.source,
b.purpose,
- a.*
+ b.charger,
+ b.create_time as device_create_time
+ </sql>
+
+ <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
+ select
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
left join ja_fw_device b on (a.device_id = b.id)
@@ -46,16 +53,7 @@
<select id="selectFwDeviceScrapPage" resultMap="fwDeviceScrapResultMap">
select
- b.device_name,
- b.device_type,
- b.device_att,
- b.device_model,
- b.belong_dept,
- b.device_specification,
- b.manufacturer,
- b.source,
- b.purpose,
- a.*
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
left join ja_fw_device b on (a.device_id = b.id)
--
Gitblit v1.9.3