|
@@ -556,10 +556,14 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
|
|
|
String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
|
|
|
if (type == 1) {//今日分时列表
|
|
|
- reportList = reportMapper.selectReportDetail(nowDate);
|
|
|
+ List<JSONObject> nowReportList = reportMapper.selectReportDetail(nowDate);
|
|
|
+ List<JSONObject> yesterdayReportList = reportMapper.selectReportDetail(anotherDay);
|
|
|
+ JSONObject json = new JSONObject();
|
|
|
+ json.put("now", nowReportList);
|
|
|
+ json.put("yesterday", yesterdayReportList);
|
|
|
+ reportList.add(json);
|
|
|
|
|
|
} else if (type == 2) { //昨日分时列表
|
|
|
-
|
|
|
reportList = reportMapper.selectReportDetail(anotherDay);
|
|
|
|
|
|
} else if (type == 3) {// 近七天分天列表
|