Browse Source

农业小类补贴,农民合作社统计,耕地资源更改返回键值为英文字母

zhaozhan 1 year ago
parent
commit
9995eb9c10

+ 5 - 8
src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/AgricultureBigDataServiceImpl.java

@@ -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"));
         }
 
         // 数据求和

+ 1 - 1
src/main/resources/mapper/digitalagriculture/AgricultureBigDataMapper.xml

@@ -607,7 +607,7 @@
         select
         a.dept_id deptId,d.ancestors,
         <foreach item="item" collection="map.dictList" open="" separator="," close="">
-            IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS #{item.dictLabel}
+            IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS area${item.dictValue}
         </foreach>
         FROM
         centerdata_t_farm_land_info a