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/FwDeviceMaintainPlanMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 e6860b8..62d0c4b 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
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.fw.device.mapper.FwDeviceMaintainPlanMapper">
-
<!-- 通用查询映射结果 -->
<resultMap id="fwDeviceMaintainPlanResultMap" type="org.sxkj.fw.device.vo.FwDeviceMaintainPlanVO">
<result column="id" property="id"/>
@@ -20,6 +19,8 @@
<result column="purpose" property="purpose"/>
<result column="charger" property="charger"/>
<result column="device_create_time" property="createTime"/>
+ <result column="maintain_status" property="maintainStatus"/>
+ <result column="last_maintain_time" property="lastMaintainTime"/>
</resultMap>
<sql id="deviceFields">
@@ -38,7 +39,7 @@
<select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
select
- <include refid="deviceFields"/>,a.*
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_maintain_plan a
left join ja_fw_device b on (a.device_id = b.id)
@@ -53,9 +54,9 @@
<select id="selectFwDeviceMaintainPlanPage" resultMap="fwDeviceMaintainPlanResultMap">
select
- <include refid="deviceFields"/>,a.*
+ <include refid="deviceFields"/>,a.*
from
- ja_fw_device_maintain_plan a
+ ja_fw_device_maintain_plan a
left join ja_fw_device b on (a.device_id = b.id)
<where>
a.is_deleted = 0
@@ -76,7 +77,7 @@
<select id="exportFwDeviceMaintainPlan" resultType="org.sxkj.fw.device.excel.FwDeviceMaintainPlanExcel">
- SELECT * FROM ja_fw_device_maintain_plan ${ew.customSqlSegment}
+ SELECT *
+ FROM ja_fw_device_maintain_plan ${ew.customSqlSegment}
</select>
-
</mapper>
--
Gitblit v1.9.3