修改

portal-server/src/main/java/com/zq/portal/service/StatsService.java

@@ -50,7 +50,6 @@ public class StatsService {
 
 
         List<Map<String, Object>> returnData = new ArrayList<>();
         List<Map<String, Object>> returnData = new ArrayList<>();
 
 
-
         // 婚姻
         // 婚姻
         vo.setType("IA");
         vo.setType("IA");
         List<StatsVo> fivesYearMarriageLine = hyStatsDao.getFivesYearMarriageLine(vo);
         List<StatsVo> fivesYearMarriageLine = hyStatsDao.getFivesYearMarriageLine(vo);
@@ -58,29 +57,35 @@ public class StatsService {
         Map<String, Object> hy = new HashMap<>();
         Map<String, Object> hy = new HashMap<>();
         hy.put("type", "婚姻");
         hy.put("type", "婚姻");
         vo.setType(null);// 用完设置为null不影响后台的统计
         vo.setType(null);// 用完设置为null不影响后台的统计
-        addStatsData(returnData, fivesYearMarriageLine, hy);
+        addStatsObjData(returnData, fivesYearMarriageLine, hy);
 
 
         // 社会组织
         // 社会组织
         List<StatsVo> soorganThreeYearStats = shzzStatsDao.getSoorganThreeYearStats(vo);
         List<StatsVo> soorganThreeYearStats = shzzStatsDao.getSoorganThreeYearStats(vo);
         Collections.reverse(soorganThreeYearStats);
         Collections.reverse(soorganThreeYearStats);
         Map<String, Object> shzz = new HashMap<>();
         Map<String, Object> shzz = new HashMap<>();
         shzz.put("type", "社会组织");
         shzz.put("type", "社会组织");
-        addStatsData(returnData, soorganThreeYearStats, shzz);
+        addStatsObjData(returnData, soorganThreeYearStats, shzz);
 
 
         redisUtils.setObj(PortalCacheKeys.getAppMapStatsKey(vo), returnData);
         redisUtils.setObj(PortalCacheKeys.getAppMapStatsKey(vo), returnData);
         return returnData;
         return returnData;
     }
     }
 
 
-    // 构造一个统计对象
-    private void addStatsData(List<Map<String, Object>> returnData, List<StatsVo> statsList, Map<String, Object> mapObj) {
+    /**
+     * 给map对象添加近三年的数据
+     *
+     * @param returnData
+     * @param statsList
+     * @param mapObj
+     */
+    private void addStatsObjData(List<Map<String, Object>> returnData, List<StatsVo> statsList, Map<String, Object> mapObj) {
         for (int i = 0; i < statsList.size(); i++) {
         for (int i = 0; i < statsList.size(); i++) {
             StatsVo statsVo = statsList.get(i);
             StatsVo statsVo = statsList.get(i);
             if (i == 0) {
             if (i == 0) {
-                mapObj.put("A", statsVo.getNum());
+                mapObj.put("one", statsVo.getNum());
             } else if (i == 1) {
             } else if (i == 1) {
-                mapObj.put("B", statsVo.getNum());
+                mapObj.put("two", statsVo.getNum());
             } else if (i == 2) {
             } else if (i == 2) {
-                mapObj.put("C", statsVo.getNum());
+                mapObj.put("three", statsVo.getNum());
             }
             }
         }
         }
         returnData.add(mapObj);
         returnData.add(mapObj);