|
@@ -77,13 +77,9 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
EtlKuaishouReportAccountHourly today = null;
|
|
EtlKuaishouReportAccountHourly today = null;
|
|
EtlKuaishouReportAccountHourly yesterday = null;
|
|
EtlKuaishouReportAccountHourly yesterday = null;
|
|
if (endTime.equals(startTime)) {
|
|
if (endTime.equals(startTime)) {
|
|
- Integer hour = DateUtils.getHour(DateUtils.now());
|
|
|
|
- today = etlHourlyAccountMapper.getOnedayAggregateByHour(startTime, accountId, hour);
|
|
|
|
|
|
+ today = etlHourlyAccountMapper.getOnedayAggregateByHour(startTime, accountId);
|
|
String lastDay = DateUtils.getLastDay(startTime, 1);
|
|
String lastDay = DateUtils.getLastDay(startTime, 1);
|
|
- yesterday = etlHourlyAccountMapper.getOnedayAggregateByHour(lastDay, accountId, hour);
|
|
|
|
- if (Check.isNull(today) && hour > 0) {
|
|
|
|
- today = etlHourlyAccountMapper.getOnedayAggregateByHour(startTime, accountId, hour - 1);
|
|
|
|
- }
|
|
|
|
|
|
+ yesterday = etlHourlyAccountMapper.getOnedayAggregateByHour(lastDay, accountId);
|
|
} else {
|
|
} else {
|
|
today = etlDailyAccountMapper.getOnedayAggregatebyDaily(startTime, endTime, accountId);
|
|
today = etlDailyAccountMapper.getOnedayAggregatebyDaily(startTime, endTime, accountId);
|
|
int days = DateUtils.dateDiff(startTime, endTime);
|
|
int days = DateUtils.dateDiff(startTime, endTime);
|