Merge remote-tracking branch 'origin/master'

api-server/src/main/java/com/zq/api/feign/PortalFeign.java

@@ -62,6 +62,9 @@ public interface PortalFeign {
     @PostMapping("/stats/getCremationStatsList")
     ResultVo getCremationStatsList(@RequestBody Map<String, Object> paramsMap);
 
+    @PostMapping("/stats/getCremationStatsById")
+    ResultVo getCremationStatsById(@RequestBody Map<String, Object> paramsMap);
+
     @PostMapping("/stats/getAreaUnderNumStats")
     ResultVo getAreaUnderNumStats(@RequestBody Map<String, Object> paramsMap);
 }

api-server/src/main/java/com/zq/api/service/IApiLogic.java

@@ -211,6 +211,14 @@ public interface IApiLogic extends IApiCommon {
      */
     ApiResp getCremationStatsList(ApiForm form);
 
+    /**
+     * 殡仪馆火化量统计列表
+     *
+     * @param form
+     * @return
+     */
+    ApiResp getCremationStatsById(ApiForm form);
+
     /*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓SYS接口↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
 
     /**

api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java

@@ -151,6 +151,11 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
     }
 
     @Override
+    public ApiResp getCremationStatsById(ApiForm form) {
+        return ApiUtils.toApiResp(form, portalFeign.getCremationStatsById(form.getParamsMap()));
+    }
+
+    @Override
     public ApiResp getSingleUserInfo(ApiForm form) {
         return ApiUtils.toApiResp(form, sysFeign.getSingleUserInfo(form.getAppId()));
     }

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

@@ -35,6 +35,12 @@ public class BzStatsAdminController {
         return ResultVo.success(bzStatsService.getCacheCremationStatsList(vo));
     }
 
+    @ApiOperation("获取子级殡葬火化分析列表")
+    @PostMapping(value = "/getCremationStatsById")
+    public ResultVo<Object> getCremationStatsById(@RequestBody StatsReqVo vo) {
+        return ResultVo.success(bzStatsService.getCacheCremationStatsById(vo));
+    }
+
     @ApiOperation("获取区域火化率占比")
     @PostMapping(value = "/getCremationRateStats")
     public ResultVo<Object> getCremationRateStats(@RequestBody StatsReqVo vo) {

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

@@ -111,7 +111,9 @@ public class EtStatsService {
             vo.setAreaCode(systemArea.getCode());
             VChildWelfareStats etAgencyWelfareStats = getAgencyChildStats(vo);
 
-            returnData.add(etAgencyWelfareStats);
+            if (etAgencyWelfareStats != null) {
+                returnData.add(etAgencyWelfareStats);
+            }
         }
 
         List<String> areaList = new ArrayList<>();

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

@@ -10,9 +10,9 @@
         fis_cremation_info_sum a
         LEFT JOIN fis_organ b ON b.organ_name = a.create_organ_name
         WHERE 1 = 1
-        <IF test = "subAreaCode != null and subAreaCode != ''" >
+        <if test = "subAreaCode != null and subAreaCode != ''" >
             AND b.beloing_cant_code LIKE CONCAT (#{subAreaCode},'%')
-        </ IF >
+        </if >
         GROUP BY
         LEFT (b.beloing_cant_code,#{size})
     </select>
@@ -28,7 +28,7 @@
         WHERE 1 = 1
         <if test = "subAreaCode != null and subAreaCode != ''" >
             AND b.beloing_cant_code LIKE CONCAT (#{subAreaCode},'%')
-        </ IF >
+        </if >
         GROUP BY
         a.create_organ_name,
         LEFT (b.beloing_cant_code,#{size})