From 15e588eb6a7549ecd2aaffb45e67f11e68354eb6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 05 二月 2024 18:22:19 +0800
Subject: [PATCH] 111

---
 server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 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 226358b..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
@@ -72,14 +72,22 @@
     @PostMapping("/page")
     @RequiresPermissions("business:applydetail:query")
     public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
-        return ApiResponse.success(applyDetailService.findPage(pageWrap));
+        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.findPage(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鏌ヨ")
@@ -88,4 +96,15 @@
     public ApiResponse findById(@PathVariable Integer id) {
         return ApiResponse.success(applyDetailService.findById(id));
     }
+
+
+    @ApiOperation("鏌ヨ鍛樺伐鎶曚繚璁板綍")
+    @GetMapping("/getMemberApplyList")
+    public ApiResponse<List<ApplyDetail>> getMemberApplyList(@RequestParam Integer memberId) {
+        return ApiResponse.success(applyDetailService.getMemberApplyList(memberId));
+    }
+
+
+
+
 }

--
Gitblit v1.9.3