From a22fa65d1027f8500c0494e97ff2232f70e9ca93 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 19:27:06 +0800
Subject: [PATCH] 提交一把

---
 server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 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 29e11b4..48b50ec 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,8 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
+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;
@@ -15,12 +17,13 @@
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Api(tags = "鎶曚繚鐢宠鏄庣粏淇℃伅琛�")
 @RestController
@@ -70,15 +73,42 @@
     @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) {
+        PageData<ApplyDetail> pageData = applyDetailService.findPageForCompany(pageWrap);
+        pageData.getRecords().forEach(i->{
+            if(i.getSolutionType().equals(Constants.ONE)&&!i.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
+                i.setFee(null);
+            }
+        });
+        return ApiResponse.success(pageData);
     }
 
-    @ApiOperation("瀵煎嚭Excel")
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/findList")
+    @RequiresPermissions("business:applydetail:query")
+    public ApiResponse<List<ApplyDetail>> findList (@RequestBody ApplyDetailPageDTO applyDetailPageDTO) {
+        return ApiResponse.success(applyDetailService.findListForCompany(applyDetailPageDTO));
+    }
+
+    @ApiOperation("鏌ヨ鍏ㄩ儴")
+    @PostMapping("/list")
+    @RequiresPermissions("business:applydetail:query")
+    public ApiResponse<List<ApplyDetail>> list (@RequestBody  ApplyDetail pageWrap) {
+        return ApiResponse.success(applyDetailService.findList(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) {
+        pageWrap.getModel().setIsExcel(Constants.ONE);
+        PageData<ApplyDetail> pageData = applyDetailService.findPageForCompany(pageWrap);
+        pageData.getRecords().forEach(i->{
+            if(i.getSolutionType().equals(Constants.ONE)&&!i.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
+                i.setFee(BigDecimal.ZERO);
+            }
+        });
+        ExcelExporter.build(ApplyDetail.class).exportWithFirstAndEnd(pageData.getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","鍦ㄤ繚浜哄憳鍚嶅崟",null, response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -87,4 +117,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