wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2023-01-03 17:09:52 +08:00
parent 66d6281767 ad6deaf71f
commit 011753bb7d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/modules/date_snapshot/service/impl/SysDateSnapshotServiceImpl.java
View File

@ -42,12 +42,15 @@ public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotD
public void snapshotAction(Integer type) { public void snapshotAction(Integer type) {
SysDateSnapshotDTO sysDateSnapshotDTO = new SysDateSnapshotDTO(); SysDateSnapshotDTO sysDateSnapshotDTO = new SysDateSnapshotDTO();
long countApply = tAbilityApplicationService.countApplyAll(); // 资源申请量 long countApply = tAbilityApplicationService.countApplyAll(); // 资源申请量
HashMap<String, Object> resultMap = (HashMap<String, Object>) resourceService.selectTotal();
List<Map<String, Object>> snapshot = new ArrayList<Map<String, Object>>() {{ List<Map<String, Object>> snapshot = new ArrayList<Map<String, Object>>() {{
add(new LinkedHashMap<String, Object>() {{ add(new LinkedHashMap<String, Object>() {{
put("count", countApply); put("count", countApply);
put("type", "资源申请量"); 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()); sysDateSnapshotDTO.setCreateDate(new Date());