|
@@ -444,17 +444,23 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
}
|
|
|
request.put("userIds", getUserIdList(userId));
|
|
|
List<JSONObject> data = null;
|
|
|
+ JSONObject result = new JSONObject();
|
|
|
//单日数据
|
|
|
+ String updateTime = "";
|
|
|
if (startTime.equals(endTime)) {
|
|
|
data = etlHourlyAccountMapper.queryEveryHourlyCharge(request);
|
|
|
+ updateTime = etlHourlyAccountMapper.getNewlyUpdateTime();
|
|
|
} else {
|
|
|
+ updateTime = etlDailyAccountMapper.getNewlyUpdateTime();
|
|
|
if (parameterCode.equals("campaign") || parameterCode.equals("unit")) {
|
|
|
data = etlDailyAccountMapper.queryEveryDayCount(request);
|
|
|
} else {
|
|
|
data = etlDailyAccountMapper.queryEveryDayCharge(request);
|
|
|
}
|
|
|
}
|
|
|
- return Result.ok(data);
|
|
|
+ result.put("data", data);
|
|
|
+ result.put("updateTime", updateTime);
|
|
|
+ return Result.ok(result);
|
|
|
}
|
|
|
|
|
|
/**
|