|
@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.text.ParseException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -618,12 +619,12 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
|
|
|
|
|
|
} else if ("day".equals(sign)) {
|
|
|
List<JSONObject> comparedArr = reportMapper.selectHourlyDetailsByDate(comparedDate);// 除数数据
|
|
|
- detailJson.put("statDate", beComparedDate);
|
|
|
+ detailJson.put("statDate", comparedDate);
|
|
|
detailJson.put("comparedDetail", comparedArr);
|
|
|
|
|
|
|
|
|
List<JSONObject> beComparedArr = reportMapper.selectHourlyDetailsByDate(beComparedDate);// 被除数数据
|
|
|
- detailJson.put("beStatDate", comparedDate);
|
|
|
+ detailJson.put("beStatDate", beComparedDate);
|
|
|
detailJson.put("beComparedDetail", beComparedArr);
|
|
|
|
|
|
}
|
|
@@ -636,4 +637,11 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
|
|
|
System.err.println(reportList);
|
|
|
return reportList;
|
|
|
}
|
|
|
+
|
|
|
+ public static void main(String[] args) throws ParseException {
|
|
|
+ String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
+ String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
|
|
|
+ String endDate = DateUtils.getMonthBefore("yyyy-MM-dd", anotherDay, -3);
|
|
|
+ System.err.println(endDate);
|
|
|
+ }
|
|
|
}
|