Merge remote-tracking branch 'origin/master'

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

@@ -265,7 +265,7 @@ public class CjStatsService {
         returnData.put("difficultIssueAmountList", difficultIssueAmountList);
         returnData.put("difficultIssueAmountList", difficultIssueAmountList);
         returnData.put("areaPeopleNumList", areaPeopleNumList);
         returnData.put("areaPeopleNumList", areaPeopleNumList);
 
 
-//        redisUtils.setObj(PortalCacheKeys.getAreaDisabledIssueStatsKey(vo), returnData);
+        redisUtils.setObj(PortalCacheKeys.getAreaDisabledIssueStatsKey(vo), returnData);
 
 
         return returnData;
         return returnData;
     }
     }

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

@@ -371,13 +371,13 @@ public class ShjzStatsService {
         List<StatsVo> cityMonyStats = monyStats.stream().filter(statsVo -> "1".equals(statsVo.getType())).collect(Collectors.toList());
         List<StatsVo> cityMonyStats = monyStats.stream().filter(statsVo -> "1".equals(statsVo.getType())).collect(Collectors.toList());
         cityMonyStats.forEach(statsVo -> {
         cityMonyStats.forEach(statsVo -> {
             Map<String, Object> data = map.computeIfAbsent(statsVo.getCode(), k -> new HashMap<>());
             Map<String, Object> data = map.computeIfAbsent(statsVo.getCode(), k -> new HashMap<>());
-            data.put("cityMony", statsVo.getAmount());
+            data.put("cityMoney", statsVo.getAmount());
         });
         });
         // 添加农村发放金额
         // 添加农村发放金额
         List<StatsVo> villageMonyStats = monyStats.stream().filter(statsVo -> "0".equals(statsVo.getType())).collect(Collectors.toList());
         List<StatsVo> villageMonyStats = monyStats.stream().filter(statsVo -> "0".equals(statsVo.getType())).collect(Collectors.toList());
         villageMonyStats.forEach(statsVo -> {
         villageMonyStats.forEach(statsVo -> {
             Map<String, Object> data = map.computeIfAbsent(statsVo.getCode(), k -> new HashMap<>());
             Map<String, Object> data = map.computeIfAbsent(statsVo.getCode(), k -> new HashMap<>());
-            data.put("villageMony", statsVo.getAmount());
+            data.put("villageMoney", statsVo.getAmount());
         });
         });
 
 
         List<Map<String, Object>> dataList = new ArrayList<>();
         List<Map<String, Object>> dataList = new ArrayList<>();

portal-server/src/main/resources/mapper/BzStatsMapper.xml

@@ -4,18 +4,18 @@
 
 
     <select id="getAreaCremationStats" resultType="com.zq.portal.vo.StatsVo">
     <select id="getAreaCremationStats" resultType="com.zq.portal.vo.StatsVo">
         SELECT
         SELECT
-        LEFT(d.ups, #{size}) 'code',
+        LEFT(d.id, #{size}) 'code',
         COUNT( 1 ) 'num'
         COUNT( 1 ) 'num'
         FROM
         FROM
         dic_city d
         dic_city d
         LEFT JOIN fis_cremation_info_sum f ON d.P_ID = f.POPULACE
         LEFT JOIN fis_cremation_info_sum f ON d.P_ID = f.POPULACE
         WHERE 1=1
         WHERE 1=1
         <if test="subAreaCode != null and subAreaCode != ''">
         <if test="subAreaCode != null and subAreaCode != ''">
-            ANd d.ups LIKE CONCAT (#{subAreaCode},'%')
+            ANd d.id LIKE CONCAT (#{subAreaCode},'%')
         </if>
         </if>
         AND
         AND
         LEFT(f.CREMATION_TIME, 4) >= '2017'
         LEFT(f.CREMATION_TIME, 4) >= '2017'
-        GROUP BY LEFT(d.ups, #{size})
+        GROUP BY LEFT(d.id, #{size})
     </select>
     </select>
     <select id="getCremationRateStats" resultType="com.zq.portal.vo.StatsVo">
     <select id="getCremationRateStats" resultType="com.zq.portal.vo.StatsVo">
         SELECT ROUND(hhsum.c1 / rksum.c2 * 100) 'num'
         SELECT ROUND(hhsum.c1 / rksum.c2 * 100) 'num'
@@ -79,7 +79,7 @@
             AND LEFT ( di.CREATE_TIME, 4 ) = #{year}
             AND LEFT ( di.CREATE_TIME, 4 ) = #{year}
         </if>
         </if>
         <if test="subAreaCode != null and subAreaCode != ''">
         <if test="subAreaCode != null and subAreaCode != ''">
-            AND dc.UPS LIKE CONCAT(#{subAreaCode}, '%' )
+            AND dc.id LIKE CONCAT(#{subAreaCode}, '%' )
         </if>
         </if>
         GROUP BY
         GROUP BY
         LEFT ( di.CREATE_TIME, 4 )
         LEFT ( di.CREATE_TIME, 4 )

portal-server/src/main/resources/mapper/ShjzStatsDao.xml

@@ -191,7 +191,7 @@
         LEFT ( a.area_code, #{size} ) 'code',
         LEFT ( a.area_code, #{size} ) 'code',
         a.type 'type',
         a.type 'type',
         SUM(a.people_num) 'num'
         SUM(a.people_num) 'num'
-        FROM city_coutry_all a
+        FROM 2021_city_coutry_all a
         WHERE
         WHERE
         CHAR_LENGTH (LEFT ( a.area_code, #{size} )) = #{size}
         CHAR_LENGTH (LEFT ( a.area_code, #{size} )) = #{size}
         <if test="subAreaCode != null and subAreaCode != ''">
         <if test="subAreaCode != null and subAreaCode != ''">