Merge branch 'dev'

This commit is contained in:
wangliwen 2023-01-03 17:09:52 +08:00
commit 011753bb7d
1 changed files with 4 additions and 1 deletions

View File

@ -42,12 +42,15 @@ public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotD
public void snapshotAction(Integer type) {
SysDateSnapshotDTO sysDateSnapshotDTO = new SysDateSnapshotDTO();
long countApply = tAbilityApplicationService.countApplyAll(); // 资源申请量
HashMap<String, Object> resultMap = (HashMap<String, Object>) resourceService.selectTotal();
List<Map<String, Object>> snapshot = new ArrayList<Map<String, Object>>() {{
add(new LinkedHashMap<String, Object>() {{
put("count", countApply);
put("type", "资源申请量");
}});
addAll((Collection<? extends Map<String, Object>>) resourceService.selectTotal()); // 资源汇聚量
if (resultMap.containsKey("total")) {
addAll((Collection<? extends Map<String, Object>>) resultMap.get("total"));
}
}};
sysDateSnapshotDTO.setCreateDate(new Date());