From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 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 a62e8e9..d88f5d4 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
@@ -4,18 +4,22 @@
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
 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;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -72,7 +76,24 @@
     @PostMapping("/page")
     @RequiresPermissions("business:applydetail:query")
     public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
-        return ApiResponse.success(applyDetailService.findPageForCompany(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("鍒嗛〉鏌ヨ")
+    @PostMapping("/pageForMini")
+    @RequiresPermissions("business:applydetail:query")
+    public ApiResponse<PageData<ApplyDetail>> pageForMini (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
+        PageData<ApplyDetail> pageData = applyDetailService.findPageForMini(pageWrap);
+        return ApiResponse.success(pageData);
     }
 
     @ApiOperation("鍒楄〃鏌ヨ")
@@ -93,8 +114,14 @@
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:applydetail:exportExcel")
     public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse 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);
+        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).exportWithSheetAndFirstAndEnd(pageData.getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","銆�"+pageWrap.getModel().getSolutionName()+"銆�"+"淇濆崟浜哄憳淇℃伅",null, "淇濆崟浜哄憳",response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -112,6 +139,13 @@
     }
 
 
+    @ApiOperation("鏌ヨ浜哄憳鍙姤妗堟暟鎹�")
+    @GetMapping("/getMemberSettleClaimsList")
+    public ApiResponse<List<ApplyDetail>> getMemberSettleClaimsList(@RequestParam Integer memberId) {
+        return ApiResponse.success(applyDetailService.getMemberSettleClaimsList(memberId));
+    }
+
+
 
 
 }

--
Gitblit v1.9.3