|
@@ -311,11 +311,11 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
|
|
|
JSONObject comparedJson = new JSONObject();
|
|
|
|
|
|
if ("month".equals(sign)) {
|
|
|
- Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM", bigDate, smallDate);
|
|
|
+ Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM", bigDate, smallDate);
|
|
|
beComparedJson = reportMapper.selectMonthReportByDate((String) dateMap.get("smallDate"));
|
|
|
comparedJson = reportMapper.selectMonthReportByDate((String) dateMap.get("bigDate"));
|
|
|
} else if ("day".equals(sign)) {
|
|
|
- Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM-dd", bigDate, smallDate);
|
|
|
+ Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM-dd", bigDate, smallDate);
|
|
|
beComparedJson = reportMapper.selectDayReportByDate((String) dateMap.get("smallDate"));
|
|
|
comparedJson = reportMapper.selectDayReportByDate((String) dateMap.get("bigDate"));
|
|
|
}
|
|
@@ -468,11 +468,11 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
|
|
|
List<JSONObject> comparedArr = new ArrayList<>();
|
|
|
String comparedDate = "";
|
|
|
if ("month".equals(sign)) {
|
|
|
- Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM", bigDate, smallDate);
|
|
|
+ Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM", bigDate, smallDate);
|
|
|
comparedDate = (String) dateMap.get("smallDate");
|
|
|
comparedArr = reportMapper.selectDayDetailsByMonth((String) dateMap.get("bigDate"));
|
|
|
} else if ("day".equals(sign)) {
|
|
|
- Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM-dd", bigDate, smallDate);
|
|
|
+ Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM-dd", bigDate, smallDate);
|
|
|
comparedDate = (String) dateMap.get("smallDate");
|
|
|
comparedArr = reportMapper.selectHourlyDetailsByDate((String) dateMap.get("bigDate"));
|
|
|
}
|
|
@@ -606,9 +606,9 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
|
|
|
String smallDate = requestJson.getString("smallDate");
|
|
|
Map<String, Object> dateMap = new HashMap<>();
|
|
|
if ("month".equals(sign)) {
|
|
|
- dateMap = DateUtils.compare_date("yyyy-MM", bigDate, smallDate);
|
|
|
+ dateMap = DateUtils.compareDate("yyyy-MM", bigDate, smallDate);
|
|
|
} else if ("day".equals(sign)) {
|
|
|
- dateMap = DateUtils.compare_date("yyyy-MM-dd", bigDate, smallDate);
|
|
|
+ dateMap = DateUtils.compareDate("yyyy-MM-dd", bigDate, smallDate);
|
|
|
}
|
|
|
String comparedDate = (String) dateMap.get("bigDate");
|
|
|
String beComparedDate = (String) dateMap.get("smallDate");
|