1.应急大屏中间地图接口开发

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -118,7 +118,7 @@
         FROM
             "tzs_alert_statistics"
         where
-            supervisory_unit_org_code = #{orgCode}
+            supervisory_unit_org_code like concat(#{orgCode},'%')
             and start_date=#{dto.beginDate}
             and end_date=#{dto.endDate}
     </select>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DPStatisticsServiceImpl.java

@@ -255,11 +255,11 @@ public class DPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> getCenterMapCountDataForOverview(DPFilterParamDto dpFilterParamDto) {
-        this.setDefaultFilter(dpFilterParamDto);
         return getRegionList(dpFilterParamDto).parallelStream().map(r -> {
             DPFilterParamDto filterParamDto = new DPFilterParamDto();
             filterParamDto.setCityCode(r.getRegionCode().toString());
             String orgCode =  this.getAndSetOrgCode(filterParamDto);
+            this.setDefaultFilter(filterParamDto);
             Map<String, Object> itemResult = getCenterMapOverviewData(orgCode, filterParamDto);
             itemResult.put("regionCode", r.getRegionCode());
             itemResult.put("regionName", r.getRegionName());
@@ -284,10 +284,10 @@ public class DPStatisticsServiceImpl {
 
     private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
         if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
-            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.beginOfMonth(new Date()).toDateStr());
+            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.lastMonth().toDateStr());
         }
         if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
-            dpFilterParamDto.setEndDate(cn.hutool.core.date.DateUtil.endOfMonth(new Date()).toDateStr());
+            dpFilterParamDto.setEndDate(cn.hutool.core.date.DateUtil.today());
         }
     }