|
@@ -330,11 +330,20 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
private void processAgriculturalSubsidy(String dictType, AgricultureBigDataBO agricultureBigDataBO, List<Map<String, Object>> result) {
|
|
|
List<SysDictData> dictData = DictUtils.getDictCache(dictType);
|
|
|
for (int i = 0; i < dictData.size(); i++) {
|
|
|
+ Map<String,Object> map = new HashMap<>();
|
|
|
String dictLabel = dictData.get(i).getDictLabel();
|
|
|
List<Map<String, Object>> subClassResults = getAgriculturalSubsidyBySubclass(agricultureBigDataBO, i, dictLabel);
|
|
|
String deptId = String.valueOf(agricultureBigDataBO.getDeptId());
|
|
|
result.addAll(deptLevelUtil.getDeptLevel(subClassResults, deptId));
|
|
|
+ double sum = 0.0;
|
|
|
+ for (Map<String, Object> m : subClassResults) {
|
|
|
+ Number moneyNum = (Number) m.get("MoneyNum");
|
|
|
+ sum += moneyNum.doubleValue();
|
|
|
+ }
|
|
|
+ map.put(dictLabel,sum);
|
|
|
+ result.add(map);
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -346,7 +355,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
*/
|
|
|
@DataScopeMutiDept(deptAlias = "d")
|
|
|
private List<Map<String, Object>> getAgriculturalSubsidyBySubclass(AgricultureBigDataBO agricultureBigDataBO, int i, String label) {
|
|
|
- List<Map<String, Object>> maps = agricultureBigDataMapper.getAgriculturalSubsidyBySubclass(agricultureBigDataBO, String.valueOf(i));
|
|
|
+ List<Map<String, Object>> maps = agricultureBigDataMapper.getAgriculturalSubsidyBySubclass(agricultureBigDataBO, String.valueOf(i + 1));
|
|
|
if (maps == null || maps.isEmpty()) {
|
|
|
Map<String, Object> objectObjectHashMap = new HashMap<>();
|
|
|
objectObjectHashMap.put("ancestors", 0);
|
|
@@ -357,6 +366,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
}
|
|
|
return maps;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 化肥统计
|
|
|
*
|