From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 31 一月 2024 09:37:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java index a3710bd..666cf0e 100644 --- a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java +++ b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java @@ -75,11 +75,19 @@ return ApiResponse.success(applyDetailService.findPageForCompany(pageWrap)); } - @ApiOperation("瀵煎嚭Excel") + @ApiOperation("鍒楄〃鏌ヨ") + @PostMapping("/findList") + @RequiresPermissions("business:applydetail:query") + public ApiResponse<List<ApplyDetail>> findList (@RequestBody ApplyDetailPageDTO applyDetailPageDTO) { + return ApiResponse.success(applyDetailService.findListForCompany(applyDetailPageDTO)); + } + + @ApiOperation("瀵煎嚭鍦ㄤ繚浜哄憳璇﹀崟Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:applydetail:exportExcel") public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) { - ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPageForCompany(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response); + //List<T> data, String fileName,String first,String end, HttpServletResponse response + ExcelExporter.build(ApplyDetail.class).exportWithFirstAndEnd(applyDetailService.findPageForCompany(pageWrap).getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","鍦ㄤ繚浜哄憳鍚嶅崟",null, response); } @ApiOperation("鏍规嵁ID鏌ヨ") -- Gitblit v1.9.3