Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/YJDPStatisticsController.java

@@ -210,7 +210,11 @@ public class YJDPStatisticsController {
     @ApiOperation(value = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-底部表格",
             notes = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-底部表格")
     @PostMapping("/alertRecordTable/dp")
-    public ResponseModel<IPage<Map<String, Object>>> alertRecordTableForDP(@Validated @RequestBody DPFilterParamForDetailDto recordFilterVo) {
+    public ResponseModel<IPage<Map<String, Object>>> alertRecordTableForDP(@Validated @RequestBody DPFilterParamForDetailDto recordFilterVo,
+                                                                           @RequestParam(value = "current") Integer current,
+                                                                           @RequestParam(value = "size") Integer size) {
+        recordFilterVo.setCurrent(current);
+        recordFilterVo.setSize(size);
         return statisticsService.alertRecordTableForDP(recordFilterVo);
     }
 
@@ -243,7 +247,11 @@ public class YJDPStatisticsController {
     @ApiOperation(value = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-表格",
             notes = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-表格")
     @PostMapping("/alertUseUnitTable/dp")
-    public ResponseModel<IPage<AlertUseUnitStatistics>> alertUseUnitTableForDP(@Validated @RequestBody DPFilterParamForDetailDto detailDto) {
+    public ResponseModel<IPage<AlertUseUnitStatistics>> alertUseUnitTableForDP(@Validated @RequestBody DPFilterParamForDetailDto detailDto,
+                                                                               @RequestParam(value = "current") Integer current,
+                                                                               @RequestParam(value = "size") Integer size) {
+        detailDto.setCurrent(current);
+        detailDto.setSize(size);
         return statisticsService.alertUseUnitTableForDP(detailDto);
     }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -400,7 +400,7 @@ public class YJDPStatisticsServiceImpl {
 
 
     public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
-        this.setDefaultFilter(dpFilterParamDto);
+        // this.setDefaultFilter(dpFilterParamDto);
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto);
         if (StringUtils.isNotEmpty(orgCode)) {
             return this.getCenterMapOverviewData(orgCode, dpFilterParamDto);