|
@@ -93,7 +93,7 @@ public class KuaiShouAccountReportCtrl {
|
|
|
String target = requestBody.getString("target");
|
|
|
String order = requestBody.getString("order");
|
|
|
try {
|
|
|
- List<JSONObject> listData = kuaiShouAccountReportService.getListDataBy(mediaId, discount, accounts, startDate, endDate, hour, target, order);
|
|
|
+ List<JSONObject> listData = kuaiShouAccountReportService.getListDataBy(mediaId, accounts, startDate, endDate, hour, target, order);
|
|
|
result.setResult(listData);
|
|
|
result.setSuccess(true);
|
|
|
} catch (Exception e) {
|
|
@@ -136,7 +136,7 @@ public class KuaiShouAccountReportCtrl {
|
|
|
}
|
|
|
String order = requestBody.getString("order");
|
|
|
int hour = requestBody.getInteger("hour");
|
|
|
- List<JSONObject> excelData = kuaiShouAccountReportService.getExcelDataBy(filed, mediaId, accounts, startDate, endDate, hour, target, order);
|
|
|
+ List<JSONObject> excelData = kuaiShouAccountReportService.getListDataBy(filed, accounts, startDate, endDate, hour, target, order);
|
|
|
if (excelData.isEmpty()) {
|
|
|
return;
|
|
|
}
|