From 497e3161f4e8fc2be2a78a348ccf3dfcfe4ea602 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 17 Jan 2026 15:40:01 +0800
Subject: [PATCH] 反制
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
index 590fa41..e6860b8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -19,10 +19,10 @@
<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="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
- select
+ <sql id="deviceFields">
b.device_name,
b.device_type,
b.device_att,
@@ -33,7 +33,12 @@
b.source,
b.purpose,
b.charger,
- a.*
+ b.create_time as device_create_time
+ </sql>
+
+ <select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
+ select
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_maintain_plan a
left join ja_fw_device b on (a.device_id = b.id)
@@ -48,17 +53,7 @@
<select id="selectFwDeviceMaintainPlanPage" resultMap="fwDeviceMaintainPlanResultMap">
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,
- b.charger,
- a.*
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_maintain_plan a
left join ja_fw_device b on (a.device_id = b.id)
--
Gitblit v1.9.3