From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Mon, 02 Feb 2026 18:18:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java index d3a3b80..a41333c 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java @@ -85,13 +85,13 @@ * 设备统计 - 按类型统计 * @return 统计数据 */ - List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList); + List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList,String currentDeptId); /** * 设备出库去向统计 * @return 统计数据 */ - List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList); + List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList,String currentDeptId); /** * 设备生产厂商统计 -- Gitblit v1.9.3