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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2023-01-10 14:17:00 +08:00
parent f6d8cb2c95 9a78f132ae
commit a61d906f94
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -2434,6 +2434,16 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
Map<String, List<Map<String, Object>>> typeCountListMap = typeCountListByApplyDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString())); Map<String, List<Map<String, Object>>> typeCountListMap = typeCountListByApplyDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString()));
ArrayList<Map> resultList = new ArrayList<>(); ArrayList<Map> resultList = new ArrayList<>();
Map<String, Integer> countMap = new HashMap<>(); Map<String, Integer> countMap = new HashMap<>();
countMap.put("yyzy", 0);
countMap.put("znsf", 0);
countMap.put("tcfw", 0);
countMap.put("kfzj", 0);
countMap.put("ywzj", 0);
countMap.put("jcss", 0);
countMap.put("zsk", 0);
countMap.put("sjzy", 0);
countMap.put("yzy", 0);
countMap.put("ysp", 0);
typeCountListMap.forEach((k, v) -> { typeCountListMap.forEach((k, v) -> {
HashMap<Object, Object> map = new HashMap<>(); HashMap<Object, Object> map = new HashMap<>();
map.put("count", v.stream().mapToInt(it -> Integer.parseInt(it.get("count").toString())).sum()); map.put("count", v.stream().mapToInt(it -> Integer.parseInt(it.get("count").toString())).sum());
@ -2475,7 +2485,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
resultList.add(count); resultList.add(count);
return resultList; return resultList;
} else if (params.containsKey("region") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("region").toString())) { // 查区域 } else if (params.containsKey("region") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("region").toString())) { // 查区域
List<Map<String, Object>> typeCountListByApplyDept = resourceDao.selectApplyDeptDetailTypeCountList(params); List<Map<String, Object>> typeCountListByApplyDept = resourceDao.selectApplyDeptDetailTypeCountList(params);
if ("250000".equals(params.get("region").toString())) { if ("250000".equals(params.get("region").toString())) {
List<Map<String, Object>> zwyCountListByApplyDept = new ArrayList<>(); List<Map<String, Object>> zwyCountListByApplyDept = new ArrayList<>();