renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部门统计bug修复

Browse Source
This commit is contained in:
wanghao
2026-01-08 15:19:46 +08:00
parent 7362ca6b8a
commit 464abc6521
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java
+6 -4
View File
@@ -108,6 +108,7 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
private WatchMonitorDataMapper watchMonitorDataMapper;
@Autowired
private AsyncTaskExecutor asyncTaskExecutor;
//删除临时文件
public static void delLocalFile(File file) {
String resourceFileName = file.getName();
@@ -808,8 +809,9 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
}
private int departComparator(SysDepart d1, SysDepart d2) {
Integer order1 = d1.getDepartOrder();
Integer order2 = d2.getDepartOrder();
Integer order1 = null != d1 ? d1.getDepartOrder() : null;
Integer order2 = null != d2 ? d2.getDepartOrder() : null;
if (ObjectUtil.isNull(order1) && ObjectUtil.isNull(order2)) {
return 0;
}
@@ -2436,9 +2438,9 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
// 获取终端数据
Map<String, Long> deviceCount = getDeviceCount(depart);
// 获取指定单位共计下发终端数量
long totalDeviceCount = null == deviceCount.get("totalDeviceCount")?0L:deviceCount.get("totalDeviceCount");
long totalDeviceCount = null == deviceCount.get("totalDeviceCount") ? 0L : deviceCount.get("totalDeviceCount");
// 获取指定单位高风险下发终端数量及共计下发终端数量
long weeklyDeviceCount = null==deviceCount.get("weeklyDeviceCount")?0L:deviceCount.get("weeklyDeviceCount");
long weeklyDeviceCount = null == deviceCount.get("weeklyDeviceCount") ? 0L : deviceCount.get("weeklyDeviceCount");
// 前两周的周一时间和周末时间
Date[] datesNo = new Date[2];