Compare commits

..

No commits in common. "9a78f132ae8124d01af70360ce84bf78e5db7c2c" and "b8de7ee23529e69bd736a172c6e5adf2430793f3" have entirely different histories.

1 changed files with 1 additions and 10 deletions

View File

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