bug修复

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

@@ -10,12 +10,7 @@ import com.sundot.airport.common.core.page.TableDataInfo;
 import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 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.SeizeCategoryQuantityVO;
-import com.sundot.airport.ledger.domain.vo.SeizeTotalAndItemVO;
-import com.sundot.airport.ledger.domain.vo.SeizureAreaVO;
+import com.sundot.airport.ledger.domain.vo.*;
 import com.sundot.airport.ledger.service.ILedgerSeizureStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -95,8 +90,8 @@ public class LedgerSeizureStatsController extends BaseController {
      */
     @PostMapping("/countSeizureInfoItem")
     public AjaxResult countSeizureInfoItem(@RequestBody CountQueryReqVO countQueryReq) {
-        SeizeTotalAndItemVO seizeTotalAndItem = service.getTimeRangeStats(countQueryReq);
-        return AjaxResult.success(seizeTotalAndItem);
+        DailyDeptStatisticsVO dailyDeptStatisticsVO = service.getTimeRangeStats(countQueryReq);
+        return AjaxResult.success(dailyDeptStatisticsVO);
     }
 
     /**

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

@@ -2,6 +2,8 @@ package com.sundot.airport.web.controller.ledger;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.ledger.domain.vo.EmployeeAdditionalScoreVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -105,4 +107,13 @@ public class ScoreEmployeeAdditionalController extends BaseController {
         List<ScoreEmployeeAdditional> list = scoreEmployeeAdditionalService.selectScoreEmployeeAdditionalList(scoreEmployeeAdditional);
         return success(list);
     }
-}
+
+    /**
+     * 按员工分组获取每个员工下的附加总分
+     */
+    @GetMapping("/getTotalScoreByEmployee")
+    public AjaxResult getTotalScoreByEmployee(ScoreEmployeeAdditional scoreEmployeeAdditional) {
+        List<EmployeeAdditionalScoreVO> result = scoreEmployeeAdditionalService.selectTotalScoreByEmployee(scoreEmployeeAdditional);
+        return success(result);
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 功能描述：每日部门统计数据 VO，适用于折线图展示
+ *
+ * @author Assistant
+ * @date 2026/5/25
+ */
+@Data
+public class DailyDeptStatisticsVO implements Serializable {
+    /**
+     * 总查获数
+     */
+    private Integer totalSeizeNum;
+    
+    /**
+     * 每日部门统计数据项列表
+     */
+    private List<DailyDeptItemVO> itemList;
+    
+    @Data
+    public static class DailyDeptItemVO implements Serializable {
+        /**
+         * 部门名称
+         */
+        private String deptName;
+        
+        /**
+         * 日期
+         */
+        private Date date;
+        
+        /**
+         * 查获数量
+         */
+        private Integer seizeNum;
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 员工附加分统计结果VO
+ */
+@Data
+public class EmployeeAdditionalScoreVO {
+
+    /**
+     * 员工ID
+     */
+    @JsonProperty("userId")
+    private Long userId;
+
+    /**
+     * 员工姓名
+     */
+    @JsonProperty("userName")
+    private String userName;
+
+    /**
+     * 部门ID
+     */
+    @JsonProperty("deptId")
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    @JsonProperty("deptName")
+    private String deptName;
+
+    /**
+     * 队室/班组ID
+     */
+    @JsonProperty("teamId")
+    private Long teamId;
+
+    /**
+     * 队室/班组
+     */
+    @JsonProperty("teamName")
+    private String teamName;
+
+    /**
+     * 通道/小组ID
+     */
+    @JsonProperty("groupId")
+    private Long groupId;
+
+    /**
+     * 通道/小组
+     */
+    @JsonProperty("groupName")
+    private String groupName;
+
+    /**
+     * 总分
+     */
+    @JsonProperty("totalScore")
+    private BigDecimal totalScore;
+}

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

@@ -1,24 +0,0 @@
-package com.sundot.airport.ledger.domain.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 功能描述：查获信息展示-总数和项目信息
- *
- * @author PanHu Sun
- * @date 2026/5/20 13:36
- */
-@Data
-public class SeizeTotalAndItemVO implements Serializable {
-    /**
-     * 总查获数（左侧大数字）
-     */
-    private Integer totalSeizeNum;
-    /**
-     * 柱状图明细列表（右侧）
-     */
-    private List<SeizeItemVO> itemList;
-}

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/ScoreEmployeeAdditionalMapper.java

@@ -1,8 +1,11 @@
 package com.sundot.airport.ledger.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sundot.airport.ledger.domain.ScoreEmployeeAdditional;
+import com.sundot.airport.ledger.domain.vo.EmployeeAdditionalScoreVO;
 
 /**
  * 员工附加分Mapper接口
@@ -15,4 +18,12 @@ public interface ScoreEmployeeAdditionalMapper extends BaseMapper<ScoreEmployeeA
      * @return 员工附加分集合
      */
     List<ScoreEmployeeAdditional> selectScoreEmployeeAdditionalList(ScoreEmployeeAdditional scoreEmployeeAdditional);
-}
+
+    /**
+     * 按员工分组统计附加总分
+     *
+     * @param scoreEmployeeAdditional 查询条件
+     * @return 员工及对应总分列表
+     */
+    List<EmployeeAdditionalScoreVO> selectTotalScoreByEmployee(ScoreEmployeeAdditional scoreEmployeeAdditional);
+}

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

@@ -3,12 +3,7 @@ package com.sundot.airport.ledger.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 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.SeizeCategoryQuantityVO;
-import com.sundot.airport.ledger.domain.vo.SeizeTotalAndItemVO;
-import com.sundot.airport.ledger.domain.vo.SeizureAreaVO;
+import com.sundot.airport.ledger.domain.vo.*;
 
 public interface ILedgerSeizureStatsService extends IService<LedgerSeizureStats> {
     List<LedgerSeizureStats> selectList(LedgerSeizureStats query);
@@ -45,7 +40,7 @@ public interface ILedgerSeizureStatsService extends IService<LedgerSeizureStats>
      * @author PanHu Sun
      * @date 2026/5/20 13:43
      */
-    SeizeTotalAndItemVO getTimeRangeStats(CountQueryReqVO countQueryReq);
+    DailyDeptStatisticsVO getTimeRangeStats(CountQueryReqVO countQueryReq);
 
     /**
      * 功能描述：查获物品分布

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

@@ -3,6 +3,7 @@ package com.sundot.airport.ledger.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.ledger.domain.ScoreEmployeeAdditional;
+import com.sundot.airport.ledger.domain.vo.EmployeeAdditionalScoreVO;
 
 /**
  * 员工附加分Service接口
@@ -47,4 +48,12 @@ public interface IScoreEmployeeAdditionalService extends IService<ScoreEmployeeA
      * @return 结果
      */
     int deleteScoreEmployeeAdditionalById(Long id);
-}
+
+    /**
+     * 按员工分组统计附加总分
+     *
+     * @param scoreEmployeeAdditional 查询条件
+     * @return 员工及对应总分列表
+     */
+    List<EmployeeAdditionalScoreVO> selectTotalScoreByEmployee(ScoreEmployeeAdditional scoreEmployeeAdditional);
+}

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

@@ -3,23 +3,20 @@ package com.sundot.airport.ledger.service.impl;
 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.enums.DeptTypeEnum;
 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.domain.vo.*;
 import com.sundot.airport.ledger.mapper.LedgerSeizureStatsMapper;
 import com.sundot.airport.ledger.service.ILedgerSeizureStatsService;
+import com.sundot.airport.system.service.ISysDeptService;
 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.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +32,10 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
     @Autowired
     private LedgerSeizureStatsMapper mapper;
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+
     @Override
     public List<LedgerSeizureStats> selectList(LedgerSeizureStats query) {
         return mapper.selectList(query);
@@ -160,18 +161,145 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
      * @date 2026/5/20 13:43
      */
     @Override
-    public SeizeTotalAndItemVO getTimeRangeStats(CountQueryReqVO countQueryReq) {
-        SeizeTotalAndItemVO result = new SeizeTotalAndItemVO();
+    public DailyDeptStatisticsVO getTimeRangeStats(CountQueryReqVO countQueryReq) {
+        DailyDeptStatisticsVO result = new DailyDeptStatisticsVO();
         // 总查获数
         Integer total = this.baseMapper.statsTimeRangeTotal(countQueryReq);
         result.setTotalSeizeNum(total);
-        // 柱状明细
-        List<SeizeItemVO> itemList = this.baseMapper.statsTimeRangeItem(countQueryReq);
+
+        List<DailyDeptStatisticsVO.DailyDeptItemVO> itemList = getDetailedStatsByLevel(countQueryReq);
+        
+        // 每日部门统计数据
         result.setItemList(itemList);
         return result;
     }
 
     /**
+     * 获取详细统计数据（每天每个部门/班组/小组的数据）
+     *
+     */
+    private List<DailyDeptStatisticsVO.DailyDeptItemVO> getDetailedStatsByLevel(CountQueryReqVO countQueryReq) {
+        List<DailyDeptStatisticsVO.DailyDeptItemVO> result = Lists.newArrayList();
+        
+        // 生成时间范围内的所有日期列表
+        List<Date> dateRange = generateDateRange(countQueryReq.getStartDate(), countQueryReq.getEndDate());
+        
+        // 判断查询类型
+        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);
+            
+            if (CollUtil.isNotEmpty(brigadeList)) {
+                for (SysDept brigade : brigadeList) {
+                    processDepartmentData(countQueryReq, dateRange, brigade.getDeptName(), brigade.getDeptId(), "DEPT", result);
+                }
+            }
+        } 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;
+    }
+    
+    /**
+     * 处理单个部门/团队/小组的数据
+     */
+    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());
+        
+        // 根据层级类型设置查询参数
+        switch (levelType) {
+            case "BRIGADE":
+                req.setDeptId(targetId);
+                break;
+            case "MANAGER":
+                req.setTeamId(targetId);
+                break;
+            case "TEAMS":
+                req.setGroupId(targetId);
+                break;
+        }
+        
+        // 获取统计数据
+        List<CountSeizureSingleQuantityResVO> dailyData = this.baseMapper.countSeizureSingleQuantity(req);
+        
+        // 创建日期到统计数据的映射
+        Map<String, CountSeizureSingleQuantityResVO> dataMap = dailyData.stream()
+                .collect(Collectors.toMap(
+                        item -> DateUtils.formatDateKey(item.getRecordDate()),
+                        item -> item,
+                        (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);
+            }
+        }
+    }
+
+    /**
+     * 生成日期范围列表
+     */
+    private List<Date> generateDateRange(Date startDate, Date endDate) {
+        List<Date> dateList = Lists.newArrayList();
+
+        Calendar startCal = Calendar.getInstance();
+        startCal.setTime(startDate);
+
+        Calendar endCal = Calendar.getInstance();
+        endCal.setTime(endDate);
+
+        while (!startCal.getTime().after(endCal.getTime())) {
+            dateList.add(startCal.getTime());
+            startCal.add(Calendar.DAY_OF_MONTH, 1);
+        }
+
+        return dateList;
+    }
+
+    /**
      * 功能描述：查获物品分布
      *
      * @param countQueryReq 查询参数
@@ -202,4 +330,4 @@ public class LedgerSeizureStatsServiceImpl extends ServiceImpl<LedgerSeizureStat
         List<SeizureAreaVO> seizureAreaList = this.baseMapper.countSeizeAreaQuantity(countQueryReq);
         return CollUtil.emptyIfNull(seizureAreaList);
     }
-}
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.ledger.domain.ScoreEmployeeAdditional;
+import com.sundot.airport.ledger.domain.vo.EmployeeAdditionalScoreVO;
 import com.sundot.airport.ledger.mapper.ScoreEmployeeAdditionalMapper;
 import com.sundot.airport.ledger.service.IScoreEmployeeAdditionalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,4 +81,9 @@ public class ScoreEmployeeAdditionalServiceImpl extends ServiceImpl<ScoreEmploye
     public int deleteScoreEmployeeAdditionalById(Long id) {
         return scoreEmployeeAdditionalMapper.deleteById(id);
     }
-}
+
+    @Override
+    public List<EmployeeAdditionalScoreVO> selectTotalScoreByEmployee(ScoreEmployeeAdditional scoreEmployeeAdditional) {
+        return scoreEmployeeAdditionalMapper.selectTotalScoreByEmployee(scoreEmployeeAdditional);
+    }
+}

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

@@ -222,5 +222,9 @@
         <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>
+        <!-- 筛选空值 -->
+        AND dept_id IS NOT NULL AND dept_id != ''
+        AND team_id IS NOT NULL AND team_id != ''
+        AND inspector_id IS NOT NULL AND inspector_id != ''
     </sql>
 </mapper>

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

@@ -60,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </choose>,
             SUM(throughput) AS totalThroughput,
             COUNT(*) AS totalRecord,
-            <!-- 过检率：分母0返回0.0，保留1位小数 -->
-            ROUND(IF(COUNT(*) = 0, 0, SUM(throughput) / COUNT(*)), 1) AS throughputRate
+            <!-- 过检率：分母0返回0.0，保留1位小数，使用总人数/不重复小时数来计算平均每小时过检人数 -->
+            ROUND(IF(COUNT(DISTINCT hour_of_day) = 0, 0, SUM(throughput) / COUNT(DISTINCT hour_of_day)), 1) AS throughputRate
         FROM operation_lane_peak_throughput
         WHERE
             del_flag = '0'
@@ -83,4 +83,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY record_date ASC
     </select>
 
-</mapper>
+</mapper>

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

@@ -50,4 +50,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
-</mapper>
+    <select id="selectTotalScoreByEmployee" parameterType="ScoreEmployeeAdditional" resultType="com.sundot.airport.ledger.domain.vo.EmployeeAdditionalScoreVO">
+        select 
+            user_id as userId,
+            user_name as userName,
+            dept_id as deptId,
+            dept_name as deptName,
+            team_id as teamId,
+            team_name as teamName,
+            group_id as groupId,
+            group_name as groupName,
+            sum(
+                case 
+                    when type = 1 then score 
+                    when type = 2 then -score 
+                    else 0 
+                end
+            ) as totalScore
+        from score_employee_additional
+        <where>
+            del_flag = '0'
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="teamId != null "> and team_id = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>
+            <if test="groupId != null "> and group_id = #{groupId}</if>
+            <if test="groupName != null  and groupName != ''"> and group_name like concat('%', #{groupName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="monthOfRecord != null  and monthOfRecord != ''"> and month_of_record = #{monthOfRecord}</if>
+            <if test="type != null "> and type = #{type}</if>
+        </where>
+        group by user_id, user_name, dept_id, dept_name, team_id, team_name, group_id, group_name
+        order by totalScore desc
+    </select>
+</mapper>