From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 30 +++++++++++++++++-------------
1 files changed, 17 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..d5be047 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)
@@ -73,6 +71,12 @@
<if test="param2.belongDept != null and param2.belongDept != ''">
and belong_dept = #{param2.belongDept}
</if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and a.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
</where>
</select>
--
Gitblit v1.9.3