|
@@ -123,11 +123,14 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
JSONObject obj = new JSONObject();
|
|
|
List<JSONObject> todayList = null;
|
|
|
List<JSONObject> yesterdayList = null;
|
|
|
+ String updateTime = "";
|
|
|
if (endTime.equals(startTime)) {
|
|
|
+ updateTime = etlHourlyAccountMapper.getNewlyUpdateTime();
|
|
|
todayList = etlHourlyAccountMapper.getOnedayEtlReportList(startTime, accountId, value, type);
|
|
|
String lastDay = DateUtils.getLastDay(startTime, 1);
|
|
|
yesterdayList = etlHourlyAccountMapper.getOnedayEtlReportList(lastDay, accountId, value, type);
|
|
|
} else {
|
|
|
+ updateTime = etlDailyAccountMapper.getNewlyUpdateTime();
|
|
|
todayList = etlDailyAccountMapper.getOnedayEtlReportList(startTime, endTime, accountId, value, type);
|
|
|
int days = DateUtils.dateDiff(startTime, endTime);
|
|
|
String endTime2 = DateUtils.getLastDay(startTime, 1);
|
|
@@ -149,6 +152,7 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
}
|
|
|
obj.put("today", todayList);
|
|
|
obj.put("yesterday", yesterdayList);
|
|
|
+ obj.put("updateTime", updateTime);
|
|
|
return Result.ok(obj);
|
|
|
}
|
|
|
|