From 8a7797cf8ba37fa1beec625209a6964a3668b994 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 23 一月 2024 18:18:33 +0800
Subject: [PATCH] 111

---
 server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 8699678..a3710bd 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
@@ -6,6 +6,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.ApplyDetailPageDTO;
 import com.doumee.dao.business.model.ApplyDetail;
 import com.doumee.service.business.ApplyDetailService;
 import io.swagger.annotations.Api;
@@ -70,15 +71,15 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:applydetail:query")
-    public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetail> pageWrap) {
-        return ApiResponse.success(applyDetailService.findPage(pageWrap));
+    public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
+        return ApiResponse.success(applyDetailService.findPageForCompany(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:applydetail:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<ApplyDetail> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPage(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response);
+    public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPageForCompany(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -87,4 +88,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