浏览代码

农民合作社统计拆分返回结果

zhaozhan 1 年之前
父节点
当前提交
c02bef294b

+ 1 - 1
src/main/java/com/sooka/sponest/data/digitalagriculture/service/IAgricultureBigDataService.java

@@ -66,7 +66,7 @@ public interface IAgricultureBigDataService {
 
     List<Map<String,Object>> getFarmlandStatistics(AgricultureBigDataBO agricultureBigDataBO);
 
-    List<Map<String,Object>> getCooperativesStatistics(AgricultureBigDataBO agricultureBigDataBO);
+    Map<String,List<Map<String, Object>>> getCooperativesStatistics(AgricultureBigDataBO agricultureBigDataBO);
 
     List<Map<String,Object>> getLandUseMethod(AgricultureBigDataBO agricultureBigDataBO);
 

+ 9 - 6
src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/AgricultureBigDataServiceImpl.java

@@ -394,8 +394,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
      */
     @Override
     @DataScopeMutiDept(deptAlias = "d")
-    public List<Map<String, Object>> getCooperativesStatistics(AgricultureBigDataBO agricultureBigDataBO) {
+    public Map<String,List<Map<String, Object>>> getCooperativesStatistics(AgricultureBigDataBO agricultureBigDataBO) {
         setSookaDataBase(agricultureBigDataBO);
+        Map<String,List<Map<String, Object>>> hashMap = new HashMap<>();
         // 合作社数量
         List<Map<String, Object>> cooperativesStatisticsByCooperatives = agricultureBigDataMapper.getCooperativesStatisticsByCooperatives(agricultureBigDataBO);
         List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(cooperativesStatisticsByCooperatives,String.valueOf(agricultureBigDataBO.getDeptId())));
@@ -423,23 +424,25 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             cooperativesStatistics.get(i).put("mobilizeFarmers",statisticsByDrivenFarmersNumList.get(i).get("num"));
         }
 
+        hashMap.put("demonstration",cooperativesStatistics);
+        List<Map<String, Object>> mapList=new ArrayList<>();
         // 数据求和
         Map<String, Object> registerCapitalSumMap = new HashMap<>();
         registerCapitalSumMap.put("name", "成员出资额总额");
         registerCapitalSumMap.put("num", registerCapitalSum);
-        cooperativesStatistics.add(registerCapitalSumMap);
+        mapList.add(registerCapitalSumMap);
 
         Map<String, Object> membersNumSumMap = new HashMap<>();
         membersNumSumMap.put("name", "入社人员总数");
         membersNumSumMap.put("num", membersNumSum);
-        cooperativesStatistics.add(membersNumSumMap);
+        mapList.add(membersNumSumMap);
 
         Map<String, Object> drivenFarmersNumSumMap = new HashMap<>();
         drivenFarmersNumSumMap.put("name", "带动农户总数");
         drivenFarmersNumSumMap.put("num", drivenFarmersNumSum);
-        cooperativesStatistics.add(drivenFarmersNumSumMap);
-
-        return cooperativesStatistics;
+        mapList.add(drivenFarmersNumSumMap);
+        hashMap.put("totalAmountOfCapital",mapList);
+        return hashMap;
     }
 
     /**