From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期三, 20 三月 2024 11:37:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java index 2571c0c..57780fc 100644 --- a/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java +++ b/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java @@ -73,11 +73,18 @@ public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) { return ApiResponse.success(applyDetailService.findPageForCompany(pageWrap)); } + @ApiOperation("鏌ヨ鍏ㄩ儴") + @PostMapping("/list") + @RequiresPermissions("business:applydetail:query") + public ApiResponse<List<ApplyDetail>> findList (@RequestBody ApplyDetail pageWrap) { + return ApiResponse.success(applyDetailService.findList(pageWrap)); + } @ApiOperation("瀵煎嚭鍦ㄤ繚浜哄憳璇﹀崟Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:applydetail:exportExcel") public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) { - ExcelExporter.build(ApplyDetail.class).exportWithFirstAndEnd(applyDetailService.findPageForCompany(pageWrap).getRecords(), pageWrap.getModel().getCompanyName()+"_"+pageWrap.getModel().getSolutionName()+".xlsx","鍦ㄤ繚浜哄憳鍚嶅崟",null, response); + ExcelExporter.build(ApplyDetail.class).exportWithFirstAndEnd(applyDetailService.findPageForCompany(pageWrap).getRecords(), + pageWrap.getModel().getSolutionName(),"鍦ㄤ繚浜哄憳鍚嶅崟",null, response); } @ApiOperation("鏍规嵁ID鏌ヨ") -- Gitblit v1.9.3