|
@@ -273,7 +273,7 @@ public class KuaishouReportDailyAgentSumController {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- List<KuaishouReportDailyAgent> kuaishouReportDailyAgentList = kuaishouReportDailyAgentSumService.companyReportAccountDetailList(date, advertiserName);
|
|
|
+ List<KuaishouReportDailyAgent> kuaishouReportDailyAgentList = kuaishouReportDailyAgentSumService.companyReportAccountDetailList(date, advertiserName, null);
|
|
|
result.setResult(kuaishouReportDailyAgentList);
|
|
|
result.setSuccess(true);
|
|
|
result.setMessage("success");
|
|
@@ -283,7 +283,7 @@ public class KuaishouReportDailyAgentSumController {
|
|
|
|
|
|
@AutoLog(value = "公司报表按天导出Excel")
|
|
|
@ApiOperation(value="公司报表按天导出Excel", notes="公司报表按天导出Excel")
|
|
|
- @GetMapping(value = "/companyReportExportExcel")
|
|
|
+ @PostMapping(value = "/companyReportExportExcel")
|
|
|
public void companyReportExportExcel( @RequestBody ParamsDTO dto,
|
|
|
//@RequestParam("startDate")String startDate,
|
|
|
//@RequestParam("endDate")String endDate,
|
|
@@ -334,7 +334,7 @@ public class KuaishouReportDailyAgentSumController {
|
|
|
|
|
|
@AutoLog(value = "公司日报明细表按天导出Excel")
|
|
|
@ApiOperation(value="公司日报明细表按天导出Excel", notes="公司报表按天导出Excel")
|
|
|
- @GetMapping(value = "/companyReportAccountDetailListExportExcel")
|
|
|
+ @PostMapping(value = "/companyReportAccountDetailListExportExcel")
|
|
|
public void companyReportAccountDetailListExportExcel( @RequestBody ParamsDTO dto,
|
|
|
//@RequestParam("date")String date,
|
|
|
HttpServletRequest request,
|
|
@@ -344,7 +344,7 @@ public class KuaishouReportDailyAgentSumController {
|
|
|
result.setMessage("success");
|
|
|
|
|
|
//公司报表按天明细
|
|
|
- List<KuaishouReportDailyAgent> kuaishouReportDailyAgentList = kuaishouReportDailyAgentSumService.companyReportAccountDetailList(dto.getDate(), null);
|
|
|
+ List<KuaishouReportDailyAgent> kuaishouReportDailyAgentList = kuaishouReportDailyAgentSumService.companyReportAccountDetailList(dto.getDate(), dto.getAdvertiserName(), dto.getIsExportNullData());
|
|
|
|
|
|
//导出excel
|
|
|
List<List<Object>> group = new ArrayList<>();
|