|
@@ -126,6 +126,12 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
String updateTime = "";
|
|
|
if (endTime.equals(startTime)) {
|
|
|
updateTime = etlHourlyAccountMapper.getNewlyUpdateTime();
|
|
|
+ if ("photo_share".equals(value)) {
|
|
|
+ value = "share";
|
|
|
+ }
|
|
|
+ if ("photo_comment".equals(value)) {
|
|
|
+ value = "comment";
|
|
|
+ }
|
|
|
todayList = etlHourlyAccountMapper.getOnedayEtlReportList(startTime, accountId, value, type);
|
|
|
String lastDay = DateUtils.getLastDay(startTime, 1);
|
|
|
yesterdayList = etlHourlyAccountMapper.getOnedayEtlReportList(lastDay, accountId, value, type);
|
|
@@ -147,8 +153,9 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
if (days > yesterdayNum) {
|
|
|
dayList = DateUtils.getDays(startTime2, endTime2);
|
|
|
completionTime(yesterdayList, dayList);
|
|
|
-
|
|
|
}
|
|
|
+ userRechargeListSort(todayList);
|
|
|
+ userRechargeListSort(yesterdayList);
|
|
|
}
|
|
|
obj.put("today", todayList);
|
|
|
obj.put("yesterday", yesterdayList);
|
|
@@ -172,8 +179,6 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
dataList.add(obj);
|
|
|
}
|
|
|
}
|
|
|
- //按时间排序
|
|
|
- userRechargeListSort(dataList);
|
|
|
}
|
|
|
|
|
|
private static void userRechargeListSort(List<JSONObject> list) {
|