Merge remote-tracking branch 'origin/master'

portal-server/src/main/java/com/zq/portal/controller/admin/EtStatsAdminController.java

@@ -23,13 +23,13 @@ public class EtStatsAdminController {
     @ApiOperation("统计该区域的机构和儿童数量")
     @PostMapping(value = "/getAgencyChildStats")
     public ResultVo<Object> getAgencyChildStats(@RequestBody StatsReqVo vo) {
-        return ResultVo.success(etStatsService.getCacheAgencyChildStats(vo));
+        return ResultVo.success(etStatsService.getAgencyChildStats(vo));
     }
 
     @ApiOperation("统计该区域的机构和儿童数量统计列表")
     @PostMapping(value = "/getAgencyChildStatsList")
     public ResultVo getAgencyChildStatsList(@RequestBody StatsReqVo vo) {
-        return ResultVo.success(etStatsService.getCacheAgencyChildStatsList(vo));
+        return ResultVo.success(etStatsService.getAgencyChildStatsList(vo));
     }
 
     @ApiOperation("获取福利院下的儿童统计")
@@ -41,7 +41,7 @@ public class EtStatsAdminController {
     @ApiOperation("获取区域机构占比")
     @PostMapping(value = "/getAgencyPercentageStats")
     public ResultVo<Object> getAgencyPercentageStats(@RequestBody StatsReqVo vo) {
-        return ResultVo.success(etStatsService.getCacheAgencyPercentageStats(vo));
+        return ResultVo.success(etStatsService.getAgencyPercentageStats(vo));
     }
 
     @ApiOperation("儿童搜索")

portal-server/src/main/java/com/zq/portal/controller/app/EtStatsController.java

@@ -22,13 +22,13 @@ public class EtStatsController {
     @ApiOperation("统计该区域的机构和儿童数量")
     @PostMapping(value = "/getAgencyChildStats")
     public ResultVo<Object> getAgencyChildStats(@RequestBody StatsReqVo vo) {
-        return ResultVo.success(etStatsService.getCacheAgencyChildStats(vo));
+        return ResultVo.success(etStatsService.getAgencyChildStats(vo));
     }
 
     @ApiOperation("儿童福利机构统计列表")
     @PostMapping(value = "/getAgencyChildStatsList")
     public ResultVo getAgencyChildStatsList(@RequestBody StatsReqVo vo) {
-        return ResultVo.success(etStatsService.getCacheAgencyChildStatsList(vo));
+        return ResultVo.success(etStatsService.getAgencyChildStatsList(vo));
     }
 
     @ApiOperation("获取福利院下的儿童统计")

portal-server/src/main/java/com/zq/portal/entity/VChildWelfareStats.java

@@ -21,7 +21,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@TableName(value = "v_child_welfare_stats")
+@TableName(value = "v_child_welfare")
 public class VChildWelfareStats {
 
     /**

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

@@ -54,7 +54,9 @@ public class EtStatsService {
         vo.setSubAreaCode(systemArea.subAreaCode());
         vo.setSize(vo.getSubAreaCode().length());
 
-        VChildWelfareStats build = VChildWelfareStats.builder()
+        return vChildWelfareStatsDao.selectOne(Wrappers.lambdaQuery(VChildWelfareStats.builder().areaCode(systemArea.getCode()).build()));
+
+        /*VChildWelfareStats build = VChildWelfareStats.builder()
                 .areaCode(systemArea.getCode())
                 .areaName(systemArea.getName())
                 .year(vo.getYear())
@@ -80,7 +82,7 @@ public class EtStatsService {
             vChildWelfareStatsDao.updateById(build);
         }
 
-        return build;
+        return build;*/
     }
 
     public Object getCacheAgencyChildStatsList(StatsReqVo vo) {

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

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