From 2acf49278129e5870d8b775519a2bc1461294fb8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 11 Mar 2026 08:55:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
index 9df8940..895288f 100644
--- a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
+++ b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
@@ -30,6 +30,9 @@
<result property="filePath" column="file_path" />
<result property="routeId" column="route_id" />
<result property="name" column="name" />
+ <result property="routeCreateTime" column="route_create_time" />
+ <result property="aircraft" column="aircraft" />
+ <result property="routeGroupName" column="route_group_name" />
</resultMap>
<sql id="selectArdPointCloudVo">
@@ -58,11 +61,17 @@
a.associated_state,
a.group_id,
a.file_path,
- c.id as route_id,
- c.name
- FROM ard_point_cloud a
+ c.id AS route_id,
+ c.name,
+ c.create_time as route_create_time,
+ e.dict_label as aircraft,
+ d.group_name as route_group_name
+ FROM
+ ard_point_cloud a
LEFT JOIN ard_route_cloud b ON a.id = b.cloud_id
LEFT JOIN ard_route_info c ON b.route_id = c.id
+ LEFT JOIN sys_dict_data e ON c.aircraft = e.dict_value
+ LEFT JOIN ard_route_group d ON c.group_id = d.serial_number
</sql>
<select id="selectArdPointCloudList" parameterType="ArdPointCloud" resultMap="ArdPointCloudResult">
--
Gitblit v1.9.3