Merge remote-tracking branch 'origin/master'

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/LaneThroughputResVO.java

@@ -1,5 +1,6 @@
 package com.sundot.airport.ledger.domain.vo;
 
+    import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,6 +18,7 @@ public class LaneThroughputResVO implements Serializable {
     /**
      * 日期
      */
+    @JsonFormat(pattern = "MM-dd")
     private Date recordDate;
 
     /**

airport-ledger/src/main/resources/mapper/ledger/OperationLanePeakThroughputMapper.xml

@@ -54,15 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             record_date AS recordDate,
             <!-- 动态分组名称：小组>班组>部门 -->
             <choose>
-                <when test="groupId != null">
-                    group_name AS groupName
-                </when>
-                <when test="teamId != null">
-                    team_name AS groupName
-                </when>
-                <when test="deptId != null">
-                    dept_name AS groupName
-                </when>
+                <when test="groupId != null">group_name AS groupName</when>
+                <when test="teamId != null">team_name AS groupName</when>
+                <when test="deptId != null">dept_name AS groupName</when>
             </choose>,
             SUM(throughput) AS totalThroughput,
             COUNT(*) AS totalRecord,
@@ -75,27 +69,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND record_date >= DATE_SUB(CURDATE(), INTERVAL 29 DAY)
             AND record_date &lt;= CURDATE()
             <!-- 三级联动动态筛选 -->
-            <if test="deptId != null">
-                AND dept_id = #{deptId}
-            </if>
-            <if test="teamId != null">
-                AND team_id = #{teamId}
-            </if>
-            <if test="groupId != null">
-                AND group_id = #{groupId}
-            </if>
+            <if test="deptId != null">AND dept_id = #{deptId}</if>
+            <if test="teamId != null">AND team_id = #{teamId}</if>
+            <if test="groupId != null">AND group_id = #{groupId}</if>
             <!-- 动态分组：按选中层级+日期分组 -->
         GROUP BY
             <choose>
-                <when test="groupId != null">
-                    group_id, record_date
-                </when>
-                <when test="teamId != null">
-                    team_id, record_date
-                </when>
-                <when test="deptId != null">
-                    dept_id, record_date
-                </when>
+                <when test="groupId != null">group_id, record_date, group_name</when>
+                <when test="teamId != null">team_id, record_date, team_name</when>
+                <when test="deptId != null">dept_id, record_date, dept_name</when>
             </choose>
         <!-- 按日期升序，大屏展示顺序 -->
         ORDER BY record_date ASC