|
@@ -17,6 +17,7 @@ import org.jeecg.modules.adweb.dmp.mapper.GADailyReportMapper;
|
|
|
import org.jeecg.modules.adweb.dmp.service.IGADailyReportService;
|
|
|
import org.jeecg.modules.adweb.dmp.vo.report.PeriodicStatsVO;
|
|
|
import org.jeecg.modules.adweb.enquiry.mapper.AdwebEnquiryMapper;
|
|
|
+import org.jeecg.modules.adweb.site.entity.AdwebSite;
|
|
|
import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
|
|
|
import org.jeecg.modules.redis.CacheConfig;
|
|
|
import org.jeecg.modules.redis.TTLCacheManager;
|
|
@@ -60,9 +61,11 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
|
|
|
|
|
|
// 0. 起止时间为空时,设置默认区间 - start = 网站发布日期 & end = 今天
|
|
|
if (start == null || end == null) {
|
|
|
+ AdwebSite adwebSite = adwebSiteService.getSiteByCode(siteCode);
|
|
|
start =
|
|
|
DateUtil.getTodayZeroTime(
|
|
|
- adwebSiteService.getSiteByCode(siteCode).getIssueTime());
|
|
|
+ Optional.ofNullable(adwebSite.getIssueTime())
|
|
|
+ .orElse(adwebSite.getCtime()));
|
|
|
end = DateUtil.getTodayZeroTime(new Date());
|
|
|
}
|
|
|
|