From b954d7a119eb635394bf4ff3619a9ab4b4978e48 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 09:33:34 +0800
Subject: [PATCH] sql改造首页
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 600abdf..93dc678 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
@@ -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="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
- select
+ <sql id="deviceFields">
b.device_name,
b.device_type,
b.device_att,
@@ -33,10 +33,15 @@
b.source,
b.purpose,
b.charger,
- a.*
+ 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)
+ left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="id != null and id != ''">
@@ -48,20 +53,10 @@
<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,
- b.charger,
- a.*
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
- left join ja_fw_device b on (a.device_id = b.id)
+ left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
@@ -76,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