|
@@ -353,24 +353,26 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
private PageInfo getProjectDailyCharges(List<Long> projectIds, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
Long days = 1L;
|
|
|
+ Integer hour = DateUtils.getHour(DateUtils.formatDateTime());
|
|
|
if (endTime == null) {
|
|
|
endTime = startTime;
|
|
|
} else {
|
|
|
days = DateUtils.getDiscrepantDays(startTime, endTime) + 1;
|
|
|
+ hour = 23;
|
|
|
}
|
|
|
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
Long total = baseMapper.queryTtHourProjectTopTotal(projectIds, startTime, endTime);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryTtHourProjectTop(projectIds, startTime, endTime, days);
|
|
|
+ List<JSONObject> list = baseMapper.queryTtHourProjectTop(projectIds, startTime, endTime, days, hour);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
Long total = baseMapper.queryKsHourProjectTopTotal(projectIds, startTime, endTime);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryKsHourProjectTop(projectIds, startTime, endTime, days);
|
|
|
+ List<JSONObject> list = baseMapper.queryKsHourProjectTop(projectIds, startTime, endTime, days, hour);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|