From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 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..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
@@ -3,12 +3,75 @@
<mapper namespace="org.sxkj.fw.device.mapper.FwDeviceScrapMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fwDeviceScrapResultMap" type="org.sxkj.fw.device.entity.FwDeviceScrapEntity">
+ <resultMap id="fwDeviceScrapResultMap" type="org.sxkj.fw.device.vo.FwDeviceScrapVO">
+ <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="device_name" property="deviceName"/>
+ <result column="device_type" property="deviceType"/>
+ <result column="device_att" property="deviceAtt"/>
+ <result column="device_model" property="deviceModel"/>
+ <result column="belong_dept" property="belongDept"/>
+ <result column="device_specification" property="deviceSpecification"/>
+ <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>
+ <sql id="deviceFields">
+ 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,
+ 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)
+ <where>
+ a.is_deleted = 0
+ <if test="id != null and id != ''">
+ and a.id = #{id}
+ </if>
+ </where>
+ limit 1
+ </select>
<select id="selectFwDeviceScrapPage" resultMap="fwDeviceScrapResultMap">
- select * from ja_fw_device_scrap where is_deleted = 0
+ select
+ <include refid="deviceFields"/>,a.*
+ from
+ ja_fw_device_scrap a
+ left join ja_fw_device b on (a.device_id = b.id)
+ <where>
+ a.is_deleted = 0
+ <if test="param2.deviceId != null and param2.deviceId != ''">
+ and device_id = #{param2.deviceId}
+ </if>
+ <if test="param2.deviceName != null and param2.deviceName != ''">
+ and device_name like concat('%',#{param2.deviceName},'%')
+ </if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and device_type = #{param2.deviceType}
+ </if>
+ <if test="param2.belongDept != null and param2.belongDept != ''">
+ and belong_dept = #{param2.belongDept}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3