bug修复

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerSeizureStatsController.java

@@ -75,7 +75,7 @@ public class LedgerSeizureStatsController extends BaseController {
      */
     @PostMapping("/countSeizureSingleQuantity")
     public AjaxResult countSeizureSingleQuantity(@RequestBody CountQueryReqVO countQueryReq) {
-        List<CountSeizureSingleQuantityResVO> seizureQuantityList = service.countSeizureSingleQuantity(countQueryReq);
+        List<CountSeizureSingleQuantityDateResVO> seizureQuantityList = service.countSeizureSingleQuantity(countQueryReq);
         return AjaxResult.success(seizureQuantityList);
     }
 

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

@@ -0,0 +1,42 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class CountSeizureSingleQuantityDateResVO {
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date recordDate;
+
+    /**
+     * 该日期下的查获数量明细列表
+     */
+    private List<CountSeizureSingleQuantityDateResVO.SeizureItem> items;
+
+    @Data
+    public static class SeizureItem implements Serializable {
+        /**
+         * 维度名称：员工名/小组名/班组名/部门名
+         */
+        private String groupName;
+
+        /**
+         * 当日查获数量
+         */
+        private Integer seizeQuantity;
+
+        public SeizureItem() {}
+
+        public SeizureItem(String groupName, Integer seizeQuantity) {
+            this.groupName = groupName;
+            this.seizeQuantity = seizeQuantity;
+        }
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerSeizureStatsService.java

@@ -29,7 +29,7 @@ public interface ILedgerSeizureStatsService extends IService<LedgerSeizureStats>
      * @author PanHu Sun
      * @date 2026/5/20 10:43
      */
-    List<CountSeizureSingleQuantityResVO> countSeizureSingleQuantity(CountQueryReqVO countQueryReq);
+    List<CountSeizureSingleQuantityDateResVO> countSeizureSingleQuantity(CountQueryReqVO countQueryReq);
 
     /**
      * 功能描述：查获信息展示

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

@@ -4,6 +4,7 @@ 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.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.enums.DeptTypeEnum;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.LedgerSeizureStats;
@@ -11,6 +12,7 @@ import com.sundot.airport.ledger.domain.vo.*;
 import com.sundot.airport.ledger.mapper.LedgerSeizureStatsMapper;
 import com.sundot.airport.ledger.service.ILedgerSeizureStatsService;
 import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +37,10 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
     @Autowired
     private ISysDeptService sysDeptService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+
 
     @Override
     public List<LedgerSeizureStats> selectList(LedgerSeizureStats query) {
@@ -110,173 +116,269 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
      * @date 2026/5/20 10:43
      */
     @Override
-    public List<CountSeizureSingleQuantityResVO> countSeizureSingleQuantity(CountQueryReqVO countQueryReq) {
-        List<CountSeizureSingleQuantityResVO> seizureQuantityResList = this.baseMapper.countSeizureSingleQuantity(countQueryReq);
-        seizureQuantityResList = CollUtil.emptyIfNull(seizureQuantityResList);
+    public List<CountSeizureSingleQuantityDateResVO> countSeizureSingleQuantity(CountQueryReqVO countQueryReq) {
+        List<CountSeizureSingleQuantityResVO> allData =  Lists.newArrayList();;
+        List<Date> dateRange = generateDateRange(countQueryReq.getStartDate(), countQueryReq.getEndDate());
+        
+        if (countQueryReq.getGroupId() != null) {
+            allData = handleGroupLevelQuery(countQueryReq, dateRange);
+        } else if (countQueryReq.getTeamId() != null) {
+            allData = handleTeamLevelQuery(countQueryReq, dateRange);
+        } else if (countQueryReq.getDeptId() != null) {
+            allData = handleDeptLevelQuery(countQueryReq, dateRange);
+        } else {
+            allData = handleStationLevelQuery(countQueryReq, dateRange);
+        }
 
-        log.info("SQL查询返回数据条数: {}", seizureQuantityResList.size());
+        // 按日期分组
+        Map<String, List<CountSeizureSingleQuantityResVO>> groupedByDate = allData.stream()
+                .collect(Collectors.groupingBy(vo -> DateUtils.formatDateKey(vo.getRecordDate())));
 
-        // 生成近30天的日期列表
-        List<Date> last30Days = DateUtils.generateLast30Days();
+        // 构建返回结果：每个日期对应一个对象，包含该日期下所有维度的查获数量
+        List<CountSeizureSingleQuantityDateResVO> resultList = Lists.newArrayList();
+        for (Date date : dateRange) {
+            String dateKey = DateUtils.formatDateKey(date);
+            CountSeizureSingleQuantityDateResVO dateResult = new CountSeizureSingleQuantityDateResVO();
+            dateResult.setRecordDate(date);
 
-        // 将查询结果按日期建立映射（只比较日期部分，忽略时间）
-        Map<String, CountSeizureSingleQuantityResVO> dataMap = seizureQuantityResList.stream()
+            List<CountSeizureSingleQuantityResVO> dayData = groupedByDate.get(dateKey);
+            if (CollUtil.isNotEmpty(dayData)) {
+                List<CountSeizureSingleQuantityDateResVO.SeizureItem> items = dayData.stream()
+                        .map(vo -> new CountSeizureSingleQuantityDateResVO.SeizureItem(vo.getGroupName(), vo.getSeizeQuantity()))
+                        .collect(Collectors.toList());
+                dateResult.setItems(items);
+            } else {
+                dateResult.setItems(Lists.newArrayList());
+            }
+            resultList.add(dateResult);
+        }
+
+        return resultList;
+    }
+    
+    /**
+     * 小组级别查询：获取小组下的人，按时间返回人的查获数
+     */
+    private List<CountSeizureSingleQuantityResVO> handleGroupLevelQuery(CountQueryReqVO countQueryReq, List<Date> dateRange) {
+        List<CountSeizureSingleQuantityResVO> resultList = Lists.newArrayList();
+        
+        SysDept groupDept = sysDeptService.selectDeptById(countQueryReq.getGroupId());
+        String groupName = (groupDept != null) ? groupDept.getDeptName() : "小组" + countQueryReq.getGroupId();
+        
+        List<SysUser> members = sysUserService.selectUserByDeptId(countQueryReq.getGroupId());
+        if (CollUtil.isEmpty(members)) {
+            for (Date date : dateRange) {
+                resultList.add(new CountSeizureSingleQuantityResVO(date, groupName));
+            }
+            return resultList;
+        }
+
+        CountQueryReqVO queryReq = new CountQueryReqVO();
+        queryReq.setStartDate(countQueryReq.getStartDate());
+        queryReq.setEndDate(countQueryReq.getEndDate());
+        queryReq.setGroupId(countQueryReq.getGroupId());
+        List<CountSeizureSingleQuantityResVO> memberData = this.baseMapper.countSeizureSingleQuantity(queryReq);
+        Map<String, CountSeizureSingleQuantityResVO> dataMap = memberData.stream()
                 .collect(Collectors.toMap(
-                        vo -> DateUtils.formatDateKey(vo.getRecordDate()),
+                        vo -> (DateUtils.formatDateKey(vo.getRecordDate())+"_"+vo.getGroupName()),
                         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);
+        for (SysUser member : members) {
+            memberData = CollUtil.emptyIfNull(memberData);
+            for (Date date : dateRange) {
+                String dateKey = DateUtils.formatDateKey(date)+"_"+member.getNickName();
+                if (dataMap.containsKey(dateKey)) {
+                    CountSeizureSingleQuantityResVO vo = dataMap.get(dateKey);
+                    vo.setGroupName(member.getNickName());
+                    resultList.add(vo);
+                } else {
+                    resultList.add(new CountSeizureSingleQuantityResVO(date, member.getNickName()));
+                }
             }
         }
+        
         return resultList;
     }
-
+    
     /**
-     * 功能描述：查获信息展示
-     *
-     * @param countQueryReq 查询参数
-     * @return SeizeTotalAndItemVO
-     * @method getTimeRangeStats
-     * @author PanHu Sun
-     * @date 2026/5/20 13:43
+     * 班组级别查询：获取班组下的小组，按时间返回小组的查获数
      */
-    @Override
-    public SeizeTotalAndItemVO getTimeRangeStats(CountQueryReqVO countQueryReq) {
-        SeizeTotalAndItemVO result = new SeizeTotalAndItemVO();
-        // 总查获数
-        Integer total = this.baseMapper.statsTimeRangeTotal(countQueryReq);
-        result.setTotalSeizeNum(total);
-        // 柱状明细
-        List<SeizeItemVO> itemList = this.baseMapper.statsTimeRangeItem(countQueryReq);
-        result.setItemList(itemList);
-        return result;
-    }
+    private List<CountSeizureSingleQuantityResVO> handleTeamLevelQuery(CountQueryReqVO countQueryReq, List<Date> dateRange) {
+        List<CountSeizureSingleQuantityResVO> resultList = Lists.newArrayList();
+        
+        SysDept teamDept = sysDeptService.selectDeptById(countQueryReq.getTeamId());
+        String teamName = (teamDept != null) ? teamDept.getDeptName() : "班组" + countQueryReq.getTeamId();
+        
+        List<SysDept> groups = sysDeptService.selectChildrenDeptById(countQueryReq.getTeamId());
+        if (CollUtil.isEmpty(groups)) {
+            for (Date date : dateRange) {
+                resultList.add(new CountSeizureSingleQuantityResVO(date, teamName));
+            }
+            return resultList;
+        }
+        groups = groups.stream().filter(team -> DeptTypeEnum.TEAMS.getCode().equals(team.getDeptType())).collect(Collectors.toList());
 
+        CountQueryReqVO queryReq = new CountQueryReqVO();
+        queryReq.setStartDate(countQueryReq.getStartDate());
+        queryReq.setEndDate(countQueryReq.getEndDate());
+        queryReq.setTeamId(countQueryReq.getTeamId());
+        List<CountSeizureSingleQuantityResVO> groupData = this.baseMapper.countSeizureSingleQuantity(queryReq);
+        groupData = CollUtil.emptyIfNull(groupData);
+        Map<String, CountSeizureSingleQuantityResVO> dataMap = groupData.stream()
+                .collect(Collectors.toMap(
+                        vo -> (DateUtils.formatDateKey(vo.getRecordDate())+"_"+vo.getGroupName()),
+                        vo -> vo,
+                        (existing, replacement) -> existing
+                ));
+        
+        for (SysDept group : groups) {
+            for (Date date : dateRange) {
+                String dateKey = DateUtils.formatDateKey(date)+"_"+group.getDeptName();
+                if (dataMap.containsKey(dateKey)) {
+                    CountSeizureSingleQuantityResVO vo = dataMap.get(dateKey);
+                    vo.setGroupName(group.getDeptName());
+                    resultList.add(vo);
+                } else {
+                    resultList.add(new CountSeizureSingleQuantityResVO(date, group.getDeptName()));
+                }
+            }
+        }
+        
+        return resultList;
+    }
+    
     /**
-     * 获取详细统计数据（每天每个部门/班组/小组的数据）
-     *
+     * 部门级别查询：获取部门下的班组，按时间返回班组的查获数
      */
-    private List<DailyDeptStatisticsVO.DailyDeptItemVO> getDetailedStatsByLevel(CountQueryReqVO countQueryReq) {
-        List<DailyDeptStatisticsVO.DailyDeptItemVO> result = Lists.newArrayList();
+    private List<CountSeizureSingleQuantityResVO> handleDeptLevelQuery(CountQueryReqVO countQueryReq, List<Date> dateRange) {
+        List<CountSeizureSingleQuantityResVO> resultList = Lists.newArrayList();
         
-        // 生成时间范围内的所有日期列表
-        List<Date> dateRange = generateDateRange(countQueryReq.getStartDate(), countQueryReq.getEndDate());
+        SysDept dept = sysDeptService.selectDeptById(countQueryReq.getDeptId());
+        String deptName = (dept != null) ? dept.getDeptName() : "部门" + countQueryReq.getDeptId();
         
-        // 判断查询类型
-        if (countQueryReq.getDeptId() == null && countQueryReq.getTeamId() == null && countQueryReq.getGroupId() == null) {
-            // 站级别查询：获取所有大队的数据
-            SysDept dept = new SysDept();
-            dept.setStatus("0");
-            dept.setDeptType("BRIGADE");
-            List<SysDept> brigadeList = sysDeptService.selectDeptList(dept);
+        List<SysDept> teams = sysDeptService.selectChildrenDeptById(countQueryReq.getDeptId());
+        if (CollUtil.isEmpty(teams)) {
+            for (Date date : dateRange) {
+                resultList.add(new CountSeizureSingleQuantityResVO(date, deptName));
+            }
+            return resultList;
+        }
+        //部门只要班组的
+        teams = teams.stream().filter(team -> DeptTypeEnum.MANAGER.getCode().equals(team.getDeptType())).collect(Collectors.toList());
+        CountQueryReqVO queryReq = new CountQueryReqVO();
+        queryReq.setStartDate(countQueryReq.getStartDate());
+        queryReq.setEndDate(countQueryReq.getEndDate());
+        queryReq.setDeptId(countQueryReq.getDeptId());
+        List<CountSeizureSingleQuantityResVO> teamData = this.baseMapper.countSeizureSingleQuantity(queryReq);
+        for (SysDept team : teams) {
+            teamData = CollUtil.emptyIfNull(teamData);
+            Map<String, CountSeizureSingleQuantityResVO> dataMap = teamData.stream()
+                    .collect(Collectors.toMap(
+                            vo -> (DateUtils.formatDateKey(vo.getRecordDate())+"_"+vo.getGroupName()),
+                            vo -> vo,
+                            (existing, replacement) -> existing
+                    ));
             
-            if (CollUtil.isNotEmpty(brigadeList)) {
-                for (SysDept brigade : brigadeList) {
-                    processDepartmentData(countQueryReq, dateRange, brigade.getDeptName(), brigade.getDeptId(), "DEPT", result);
+            for (Date date : dateRange) {
+                String dateKey = DateUtils.formatDateKey(date)+"_"+team.getDeptName();
+                if (dataMap.containsKey(dateKey)) {
+                    CountSeizureSingleQuantityResVO vo = dataMap.get(dateKey);
+                    vo.setGroupName(team.getDeptName());
+                    resultList.add(vo);
+                } else {
+                    resultList.add(new CountSeizureSingleQuantityResVO(date, team.getDeptName()));
                 }
             }
-        } else {
-            // 部门/班组/小组级别查询
-            String displayName = "";
-            Long targetId = null;
-            String levelType = "";
-            if (countQueryReq.getGroupId() != null) {
-                SysDept dept = sysDeptService.selectDeptById(countQueryReq.getGroupId());
-                displayName = (dept != null) ? dept.getDeptName() : "小组" + countQueryReq.getDeptId();;
-                targetId = countQueryReq.getGroupId();
-                levelType = DeptTypeEnum.TEAMS.getCode();
-            }else if (countQueryReq.getTeamId() != null) {
-                SysDept dept = sysDeptService.selectDeptById(countQueryReq.getTeamId());
-                displayName = (dept != null) ? dept.getDeptName() : "班组" + countQueryReq.getDeptId();
-                targetId = countQueryReq.getTeamId();
-                levelType =DeptTypeEnum.MANAGER.getCode();
-            } else if (countQueryReq.getDeptId() != null) {
-                SysDept dept = sysDeptService.selectDeptById(countQueryReq.getDeptId());
-                displayName = (dept != null) ? dept.getDeptName() : "部门" + countQueryReq.getDeptId();
-                targetId = countQueryReq.getDeptId();
-                levelType =DeptTypeEnum.BRIGADE.getCode();
-            }
-            
-            processDepartmentData(countQueryReq, dateRange, displayName, targetId, levelType, result);
         }
         
-        return result;
+        return resultList;
     }
     
     /**
-     * 处理单个部门/团队/小组的数据
+     * 站级别查询：获取站下的大队，按时间返回大队的查获数
      */
-    private void processDepartmentData(CountQueryReqVO countQueryReq, List<Date> dateRange, String deptName, Long targetId, String levelType, List<DailyDeptStatisticsVO.DailyDeptItemVO> result) {
-        CountQueryReqVO req = new CountQueryReqVO();
-        req.setStartDate(countQueryReq.getStartDate());
-        req.setEndDate(countQueryReq.getEndDate());
+    private List<CountSeizureSingleQuantityResVO> handleStationLevelQuery(CountQueryReqVO countQueryReq, List<Date> dateRange) {
+        List<CountSeizureSingleQuantityResVO> resultList = Lists.newArrayList();
+        
+        SysDept stationDept = new SysDept();
+        stationDept.setStatus("0");
+        stationDept.setDeptType("STATION");
+        List<SysDept> stationList = sysDeptService.selectDeptList(stationDept);
         
-        // 根据层级类型设置查询参数
-        switch (levelType) {
-            case "BRIGADE":
-                req.setDeptId(targetId);
-                break;
-            case "MANAGER":
-                req.setTeamId(targetId);
-                break;
-            case "TEAMS":
-                req.setGroupId(targetId);
-                break;
+        if (CollUtil.isEmpty(stationList)) {
+            return resultList;
         }
         
-        // 获取统计数据
-        List<CountSeizureSingleQuantityResVO> dailyData = this.baseMapper.countSeizureSingleQuantity(req);
+        SysDept station = stationList.get(0);
+        
+        SysDept brigadeDept = new SysDept();
+        brigadeDept.setStatus("0");
+        brigadeDept.setDeptType("BRIGADE");
+        List<SysDept> allBrigades = sysDeptService.selectDeptList(brigadeDept);
+        
+        List<SysDept> brigades = allBrigades.stream()
+                .filter(b -> b.getParentId() != null && b.getParentId().equals(station.getDeptId()))
+                .collect(Collectors.toList());
         
-        // 创建日期到统计数据的映射
-        Map<String, CountSeizureSingleQuantityResVO> dataMap = dailyData.stream()
+        if (CollUtil.isEmpty(brigades)) {
+            for (Date date : dateRange) {
+                resultList.add(new CountSeizureSingleQuantityResVO(date, "站"));
+            }
+            return resultList;
+        }
+
+        CountQueryReqVO queryReq = new CountQueryReqVO();
+        queryReq.setStartDate(countQueryReq.getStartDate());
+        queryReq.setEndDate(countQueryReq.getEndDate());
+        List<CountSeizureSingleQuantityResVO> brigadeData = this.baseMapper.countSeizureSingleQuantity(queryReq);
+        brigadeData = CollUtil.emptyIfNull(brigadeData);
+
+        Map<String, CountSeizureSingleQuantityResVO> dataMap = brigadeData.stream()
                 .collect(Collectors.toMap(
-                        item -> DateUtils.formatDateKey(item.getRecordDate()),
-                        item -> item,
+                        vo -> DateUtils.formatDateKey(vo.getRecordDate()) + "_" + vo.getGroupName(),
+                        vo -> vo,
                         (existing, replacement) -> existing
                 ));
         
-        // 没有数据的补0
-        for (Date date : dateRange) {
-            String dateKey = DateUtils.formatDateKey(date);
-            if (dataMap.containsKey(dateKey)) {
-                // 有数据，使用实际数据
-                CountSeizureSingleQuantityResVO dailyStat = dataMap.get(dateKey);
-                DailyDeptStatisticsVO.DailyDeptItemVO item = new DailyDeptStatisticsVO.DailyDeptItemVO();
-                item.setDeptName(deptName);
-                item.setDate(dailyStat.getRecordDate());
-                item.setSeizeNum(dailyStat.getSeizeQuantity());
-                result.add(item);
-            } else {
-                // 没有数据，补0
-                DailyDeptStatisticsVO.DailyDeptItemVO item = new DailyDeptStatisticsVO.DailyDeptItemVO();
-                item.setDeptName(deptName);
-                item.setDate(date);
-                item.setSeizeNum(0);
-                result.add(item);
+        for (SysDept brigade : brigades) {
+            for (Date date : dateRange) {
+                String dateKey = DateUtils.formatDateKey(date) + "_" + brigade.getDeptName();
+                if (dataMap.containsKey(dateKey)) {
+                    CountSeizureSingleQuantityResVO vo = dataMap.get(dateKey);
+                    vo.setGroupName(brigade.getDeptName());
+                    resultList.add(vo);
+                } else {
+                    resultList.add(new CountSeizureSingleQuantityResVO(date, brigade.getDeptName()));
+                }
             }
         }
+        
+        return resultList;
+    }
+
+    /**
+     * 功能描述：查获信息展示
+     *
+     * @param countQueryReq 查询参数
+     * @return SeizeTotalAndItemVO
+     * @method getTimeRangeStats
+     * @author PanHu Sun
+     * @date 2026/5/20 13:43
+     */
+    @Override
+    public SeizeTotalAndItemVO getTimeRangeStats(CountQueryReqVO countQueryReq) {
+        SeizeTotalAndItemVO result = new SeizeTotalAndItemVO();
+        // 总查获数
+        Integer total = this.baseMapper.statsTimeRangeTotal(countQueryReq);
+        result.setTotalSeizeNum(total);
+        // 柱状明细
+        List<SeizeItemVO> itemList = this.baseMapper.statsTimeRangeItem(countQueryReq);
+        result.setItemList(itemList);
+        return result;
     }
 
+
     /**
      * 生成日期范围列表
      */