diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java index 1078259..1932da4 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java @@ -118,12 +118,13 @@ public class EntrustMaterialCheckoutResultController { } - @GetMapping("/generateQuarterlyReportExcel") + @PostMapping("/generateQuarterlyReportExcel") + @ApiOperation("生成季度报告") public R generateQuarterlyReportExcel(@RequestBody GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException { if (dto == null || dto.getQuarterlyList() == null || dto.getQuarterlyList().size() == 0 || dto.getYear() == 0) { return R.failed("请输入正确的参数"); } - entrustMaterialCheckoutResultService.generateQuarterlyReportExcel(dto, response); - return R.ok("导出成功!"); + String filePath = entrustMaterialCheckoutResultService.generateQuarterlyReportExcel(dto, response); + return R.ok(filePath, "导出成功!"); } } diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java index 51dd2d2..a88da8c 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java @@ -86,5 +86,5 @@ public interface EntrustMaterialCheckoutResultService extends IService>> map = this.generateQuarterlyReportData(dto.getYear(), dto.getQuarterlyList()); XSSFWorkbook workbook = new XSSFWorkbook(); Set quarterlySet = map.keySet(); @@ -1629,8 +1632,20 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl