From 11336eaea12851a49b9f1cb61354f03d60f74b7c Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Wed, 11 Feb 2026 13:12:13 +0800
Subject: [PATCH] =?UTF-8?q?fit:=E5=A2=9E=E5=8A=A0=E8=88=AA=E7=BA=BF?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=8E=A5=E5=8F=A3=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/entity/AirlineFileGroupEntity.java |  5 ++++
 .../service/dto/AirlineFileGroupDTO.java      |  5 ++++
 .../mapper/airline/AirlineFileGroupMapper.xml | 29 +++++++++++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileGroupEntity.java b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileGroupEntity.java
index 71f514e..c69620c 100644
--- a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileGroupEntity.java
+++ b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileGroupEntity.java
@@ -28,6 +28,11 @@ public class AirlineFileGroupEntity extends ExBaseEntity {
      */
     private Long userId;
 
+    /**
+     * 航线数量
+     */
+    private Integer airlineCount;
+
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileGroupDTO.java b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileGroupDTO.java
index cfd347e..25e58f2 100644
--- a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileGroupDTO.java
+++ b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileGroupDTO.java
@@ -36,6 +36,11 @@ public class AirlineFileGroupDTO extends BaseEntity {
      */
     private List<AirlineFileDTO> groupInfos;
 
+    /**
+     * 航线数量
+     */
+    private Integer airlineCount;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml b/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml
index bfb84db..64094d8 100644
--- a/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml
@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag" column="del_flag" />
         <result property="deletedBy" column="deleted_by" />
         <result property="deletedTime" column="deleted_time" />
+        <result property="airlineCount" column="airline_count" />
     </resultMap>
 
     <!-- 结果映射 -->
@@ -88,18 +89,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询分组列表 -->
     <select id="selectGroupList" parameterType="com.ruoyi.airline.mapper.entity.AirlineFileGroupEntity" resultMap="AirlineFileGroupResult">
-        select group_id, group_name, user_id, create_by, create_time, update_by, update_time, del_flag, deleted_by, deleted_time
-        from airline_file_group
+        select 
+            afg.group_id, 
+            afg.group_name, 
+            afg.user_id, 
+            afg.create_by, 
+            afg.create_time, 
+            afg.update_by, 
+            afg.update_time, 
+            afg.del_flag, 
+            afg.deleted_by, 
+            afg.deleted_time,
+            COALESCE(airline_count.count, 0) as airline_count
+        from airline_file_group afg
+        left join (
+            select afgi.group_id, count(afgi.id) as count
+            from airline_file_group_info afgi
+            group by afgi.group_id
+        ) airline_count on afg.group_id = airline_count.group_id
         <where>
-            and del_flag = 0
+            afg.del_flag = 0
             <if test="groupName != null and groupName != ''">
-                and group_name like concat('%', #{groupName}, '%')
+                and afg.group_name like concat('%', #{groupName}, '%')
             </if>
             <if test="userId != null">
-                and user_id = #{userId}
+                and afg.user_id = #{userId}
             </if>
         </where>
-        order by create_time desc
+        order by afg.create_time desc
     </select>