From 21ce462f92abbaff092ce6adf49a3ee555bd0121 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Mar 2022 13:08:50 +0800
Subject: [PATCH] city_aqi_monthly月数据增加6参和综指同比计算

---
 screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index 8ee0561..698e474 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -491,6 +491,8 @@
         CityPollutionLevel days = calculateDaysByTimeAndSysArea(area, startTime, endTime);
         //������������������������������
         CityPollutionLevel compareDays = calculateDaysByTimeAndSysArea(area, compareStartTime, compareEndTime);
+        if(days==null||compareDays==null)
+            return null;
         //������������������
         List<CityAqiYearly> yearDataList = cityAqiYearlyService.getCityAqiYearlyByRegionCodeAndTime(Integer.parseInt(regionCode), startTime, endTime);
         List<CityAqiYearly> compareYearDataList = cityAqiYearlyService.getCityAqiYearlyByRegionCodeAndTime(Integer.parseInt(regionCode), compareStartTime, compareEndTime);

--
Gitblit v1.8.0