From dd664cf0ffa2eeef35c3e6955297b7fa2c903cc3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 24 十二月 2024 17:03:21 +0800
Subject: [PATCH] 完成截止12.24测试出来的问题
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index b9f80a9..1bb8478 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -127,23 +127,35 @@
<resultMap id="treeDeviceDto" type="map">
- <result property="largeCategory" column="large_category"/>
- <collection property="children" resultMap="DeviceDto" javaType="List"/>
+ <result property="label" column="laboratory_name"/>
+ <result property="value" column="value" />
+ <collection property="children" resultMap="storagePointMap" javaType="List"/>
</resultMap>
- <resultMap id="DeviceDto" type="map">
- <id property="id" column="id"/>
- <result property="deviceName" column="device_name"/>
+ <resultMap id="storagePointMap" type="map">
+ <result property="value" column="value"/>
+ <result property="label" column="storage_point"/>
+ <collection property="children" resultMap="deviceNameMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="deviceNameMap" type="map">
+ <result property="value" column="id"/>
+ <result property="label" column="device_name"/>
</resultMap>
<select id="treeDevice" resultMap="treeDeviceDto">
- select id,
- case when large_category is null || large_category ='' then '鍏朵粬'
- else large_category end as large_category, device_name
- from device
+ select
+ d.id,
+ case when l.laboratory_name is null || l.laboratory_name ='' then '鍏朵粬' else l.laboratory_name end as laboratory_name,
+ case when d.large_category is null || d.large_category ='' then '鍏朵粬' else d.large_category end as storage_point,
+ d.device_name,
+ null as value
+ from device d
+ LEFT JOIN laboratory l ON l.id = d.subordinate_departments_id
<where>
<if test="deviceName!=null and deviceName!=''">
and device_name like concat('%',#{deviceName},'%')
</if>
</where>
+ order by l.laboratory_name desc, d.large_category desc
</select>
</mapper>
--
Gitblit v1.9.3