|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
|
|
+import org.jeecg.ctop.material.constants.Check;
|
|
import org.jeecg.ctop.material.mapper.BytedanceAccountReportDailyDwMapper;
|
|
import org.jeecg.ctop.material.mapper.BytedanceAccountReportDailyDwMapper;
|
|
import org.jeecg.ctop.material.service.IBytedanceAccountReportDailyDwService;
|
|
import org.jeecg.ctop.material.service.IBytedanceAccountReportDailyDwService;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -84,7 +85,13 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> getProjectReport(Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
|
|
|
|
|
|
+ public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
|
|
|
|
+ if (Check.isNull(order)) {
|
|
|
|
+ order = "DESC";
|
|
|
|
+ }
|
|
|
|
+ if (Check.isNull(sortCode)) {
|
|
|
|
+ sortCode = "SUM(cost)";
|
|
|
|
+ }
|
|
Integer startTimeInt = DateUtils.getDateInteger(startTime);
|
|
Integer startTimeInt = DateUtils.getDateInteger(startTime);
|
|
Integer endTimeInt = DateUtils.getDateInteger(endTime);
|
|
Integer endTimeInt = DateUtils.getDateInteger(endTime);
|
|
//当前小时
|
|
//当前小时
|
|
@@ -96,11 +103,11 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
|
|
if (startTime.equals(endTime) && today.equals(startTime)) {
|
|
if (startTime.equals(endTime) && today.equals(startTime)) {
|
|
// total = bytedanceAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
|
|
// total = bytedanceAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
|
|
// PageHelper.startPage(pageNo, pageSize, false);
|
|
// PageHelper.startPage(pageNo, pageSize, false);
|
|
- data = bytedanceAccountReportDailyDwMapper.getProjectToDayReport(projectId, startTimeInt, nowHour);
|
|
|
|
|
|
+ data = bytedanceAccountReportDailyDwMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour,sortCode, order);
|
|
} else {
|
|
} else {
|
|
// total = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
|
|
// total = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
|
|
// PageHelper.startPage(pageNo, pageSize, false);
|
|
// PageHelper.startPage(pageNo, pageSize, false);
|
|
- data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour);
|
|
|
|
|
|
+ data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour,sortCode, order);
|
|
}
|
|
}
|
|
PageInfo<JSONObject> page = new PageInfo<>();
|
|
PageInfo<JSONObject> page = new PageInfo<>();
|
|
page.setList(data);
|
|
page.setList(data);
|