24.本地自测”近30天查获数量（总表）“接口；

25.本地自测”近30天查获数量（员工/小组/班组/部门）“接口；

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/CountSeizureSingleQuantityResVO.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;
@@ -16,6 +17,7 @@ public class CountSeizureSingleQuantityResVO implements Serializable {
     /**
      * 日期（X轴）
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date recordDate;
     /**
      * 维度名称：员工名/小组名/班组名/部门名（每条折线）
@@ -24,5 +26,11 @@ public class CountSeizureSingleQuantityResVO implements Serializable {
     /**
      * 当日查获数量（Y轴）
      */
-    private Integer seizeNum;
+    private Integer seizeQuantity;
+
+    public CountSeizureSingleQuantityResVO(Date date, String groupName) {
+        this.recordDate = date;
+        this.groupName = groupName;
+        this.seizeQuantity = 0;
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/CountSeizureTotalQuantityResVO.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;
@@ -16,6 +17,7 @@ public class CountSeizureTotalQuantityResVO implements Serializable {
     /**
      * 查获日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date recordDate;
     /**
      * 分组名称（部门/班组/小组/全量）
@@ -25,4 +27,10 @@ public class CountSeizureTotalQuantityResVO implements Serializable {
      * 当日查获数量
      */
     private Integer seizeQuantity;
+
+    public CountSeizureTotalQuantityResVO(Date date, String groupName) {
+        this.recordDate = date;
+        this.groupName = groupName;
+        this.seizeQuantity = 0;
+    }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerSeizureStatsServiceImpl.java

@@ -1,28 +1,34 @@
 package com.sundot.airport.ledger.service.impl;
 
-import java.util.Collections;
-import java.util.List;
-
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.LedgerSeizureStats;
 import com.sundot.airport.ledger.domain.vo.CountQueryReqVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureSingleQuantityResVO;
 import com.sundot.airport.ledger.domain.vo.CountSeizureTotalQuantityResVO;
+import com.sundot.airport.ledger.domain.vo.LaneThroughputResVO;
 import com.sundot.airport.ledger.domain.vo.SeizeCategoryQuantityVO;
 import com.sundot.airport.ledger.domain.vo.SeizeItemVO;
 import com.sundot.airport.ledger.domain.vo.SeizeTotalAndItemVO;
 import com.sundot.airport.ledger.domain.vo.SeizureAreaVO;
 import com.sundot.airport.ledger.mapper.LedgerSeizureStatsMapper;
 import com.sundot.airport.ledger.service.ILedgerSeizureStatsService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 查获违规品统计Service实现
  */
+@Slf4j
 @Service
 public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStatsMapper, LedgerSeizureStats> implements ILedgerSeizureStatsService {
 
@@ -54,7 +60,43 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
     @Override
     public List<CountSeizureTotalQuantityResVO> countSeizureTotalQuantity(CountQueryReqVO countQueryReq) {
         List<CountSeizureTotalQuantityResVO> seizureQuantityResList = this.baseMapper.countSeizureTotalQuantity(countQueryReq);
-        return CollUtil.emptyIfNull(seizureQuantityResList);
+        seizureQuantityResList = CollUtil.emptyIfNull(seizureQuantityResList);
+
+        log.info("SQL查询返回数据条数: {}", seizureQuantityResList.size());
+
+        // 生成近30天的日期列表
+        List<Date> last30Days = DateUtils.generateLast30Days();
+
+        // 将查询结果按日期建立映射（只比较日期部分，忽略时间）
+        Map<String, CountSeizureTotalQuantityResVO> dataMap = seizureQuantityResList.stream()
+                .collect(Collectors.toMap(
+                        vo -> DateUtils.formatDateKey(vo.getRecordDate()),
+                        vo -> vo,
+                        (existing, replacement) -> existing
+                ));
+
+        log.info("数据Map中的日期键: {}", dataMap.keySet());
+
+        // 获取小组名称
+        String groupName = "";
+        if (CollUtil.isNotEmpty(seizureQuantityResList)) {
+            groupName = seizureQuantityResList.get(0).getGroupName();
+        }
+
+        // 补齐缺失的日期数据
+        List<CountSeizureTotalQuantityResVO> resultList = Lists.newArrayList();
+        for (Date date : last30Days) {
+            String dateKey = DateUtils.formatDateKey(date);
+            if (dataMap.containsKey(dateKey)) {
+                // 存在的日期，使用查询结果
+                resultList.add(dataMap.get(dateKey));
+            } else {
+                // 缺失的日期，补充0数据
+                CountSeizureTotalQuantityResVO countSeizureTotalQuantity = new CountSeizureTotalQuantityResVO(date, groupName);
+                resultList.add(countSeizureTotalQuantity);
+            }
+        }
+        return resultList;
     }
 
     /**
@@ -69,7 +111,43 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
     @Override
     public List<CountSeizureSingleQuantityResVO> countSeizureSingleQuantity(CountQueryReqVO countQueryReq) {
         List<CountSeizureSingleQuantityResVO> seizureQuantityResList = this.baseMapper.countSeizureSingleQuantity(countQueryReq);
-        return CollUtil.emptyIfNull(seizureQuantityResList);
+        seizureQuantityResList = CollUtil.emptyIfNull(seizureQuantityResList);
+
+        log.info("SQL查询返回数据条数: {}", seizureQuantityResList.size());
+
+        // 生成近30天的日期列表
+        List<Date> last30Days = DateUtils.generateLast30Days();
+
+        // 将查询结果按日期建立映射（只比较日期部分，忽略时间）
+        Map<String, CountSeizureSingleQuantityResVO> dataMap = seizureQuantityResList.stream()
+                .collect(Collectors.toMap(
+                        vo -> DateUtils.formatDateKey(vo.getRecordDate()),
+                        vo -> vo,
+                        (existing, replacement) -> existing
+                ));
+
+        log.info("数据Map中的日期键: {}", dataMap.keySet());
+
+        // 获取小组名称
+        String groupName = "";
+        if (CollUtil.isNotEmpty(seizureQuantityResList)) {
+            groupName = seizureQuantityResList.get(0).getGroupName();
+        }
+
+        // 补齐缺失的日期数据
+        List<CountSeizureSingleQuantityResVO> resultList = Lists.newArrayList();
+        for (Date date : last30Days) {
+            String dateKey = DateUtils.formatDateKey(date);
+            if (dataMap.containsKey(dateKey)) {
+                // 存在的日期，使用查询结果
+                resultList.add(dataMap.get(dateKey));
+            } else {
+                // 缺失的日期，补充0数据
+                CountSeizureSingleQuantityResVO countSeizureTotalQuantity = new CountSeizureSingleQuantityResVO(date, groupName);
+                resultList.add(countSeizureTotalQuantity);
+            }
+        }
+        return resultList;
     }
 
     /**

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

@@ -94,7 +94,7 @@
                 <when test="deptId != null">dept_name AS groupName</when>
                 <otherwise>'站' AS groupName</otherwise>
             </choose>,
-            IFNULL(SUM(item_quantity), 0) AS seizeNum
+            IFNULL(SUM(item_quantity), 0) AS seizeQuantity
         FROM ledger_seizure_stats
         <where>
             <include refid="FILTER_FIXED_DATE_CRITERIA_SQL"/>
@@ -102,9 +102,9 @@
         <!-- 动态分组：重点！全为空时仅按日期分组 -->
         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>
                 <otherwise>record_date</otherwise>
             </choose>
         ORDER BY record_date ASC
@@ -121,7 +121,7 @@
                 <when test="deptId != null">team_name AS groupName</when>
                 <otherwise>dept_name AS groupName</otherwise>
             </choose>,
-            IFNULL(SUM(item_quantity), 0) AS seizeNum
+            IFNULL(SUM(item_quantity), 0) AS seizeQuantity
         FROM ledger_seizure_stats
         <where>
             <include refid="FILTER_FIXED_DATE_CRITERIA_SQL"/>
@@ -129,10 +129,10 @@
         <!-- 动态分组，严格层级下钻 -->
         GROUP BY
             <choose>
-                <when test="groupId != null">inspector_id, record_date</when>
-                <when test="teamId != null">group_id, record_date</when>
-                <when test="deptId != null">team_id, record_date</when>
-                <otherwise>dept_id, record_date</otherwise>
+                <when test="groupId != null">inspector_id, record_date, inspector_name</when>
+                <when test="teamId != null">group_id, record_date, group_name</when>
+                <when test="deptId != null">team_id, record_date, team_name</when>
+                <otherwise>dept_id, record_date, dept_name</otherwise>
             </choose>
         ORDER BY record_date ASC
     </select>