|
@@ -9,9 +9,6 @@ import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureBigDataBO;
|
|
|
import com.sooka.sponest.data.digitalagriculture.mapper.AgricultureBigDataMapper;
|
|
|
import com.sooka.sponest.data.digitalagriculture.service.IAgricultureBigDataService;
|
|
|
import com.sooka.sponest.data.utils.DeptLevelUtil;
|
|
|
-import com.sooka.sponest.data.utils.DictUtil;
|
|
|
-import org.apache.commons.collections4.IterableMap;
|
|
|
-import org.apache.commons.collections4.MapIterator;
|
|
|
import org.apache.commons.collections4.MapUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -331,7 +328,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
List<SysDictData> dictData = DictUtils.getDictCache(dictType);
|
|
|
return dictData.stream().map(dict -> {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- String dictLabel = dict.getDictLabel();
|
|
|
+ String dictLabel = "MoneyNum"+dict.getDictValue();
|
|
|
List<Map<String, Object>> subClassResults = getAgriculturalSubsidyBySubclass(agricultureBigDataBO, dictData.indexOf(dict), dictLabel);
|
|
|
double sum = subClassResults.stream().mapToDouble(m -> ((Number) m.get("MoneyNum")).doubleValue()).sum();
|
|
|
map.put(dictLabel, sum);
|
|
@@ -420,10 +417,10 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
|
|
|
// 数据分组
|
|
|
for (int i = 0; i <cooperativesStatistics.size();i++){
|
|
|
- cooperativesStatistics.get(i).put("示范级别",statisticsByLeaseTermList.get(i).get("num"));
|
|
|
- cooperativesStatistics.get(i).put("成员出资额",statisticsByRegisterCapitalList.get(i).get("num"));
|
|
|
- cooperativesStatistics.get(i).put("入社人员",statisticsByMembersNumList.get(i).get("num"));
|
|
|
- cooperativesStatistics.get(i).put("带动农户",statisticsByDrivenFarmersNumList.get(i).get("num"));
|
|
|
+ cooperativesStatistics.get(i).put("demonstrationLevel",statisticsByLeaseTermList.get(i).get("num"));
|
|
|
+ cooperativesStatistics.get(i).put("capitalContribution",statisticsByRegisterCapitalList.get(i).get("num"));
|
|
|
+ cooperativesStatistics.get(i).put("employees",statisticsByMembersNumList.get(i).get("num"));
|
|
|
+ cooperativesStatistics.get(i).put("mobilizeFarmers",statisticsByDrivenFarmersNumList.get(i).get("num"));
|
|
|
}
|
|
|
|
|
|
// 数据求和
|