From d1c205d29b5eacf1de22a7af29329ca370d1c2d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 十一月 2024 14:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 d64e557..18f0c15 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
@@ -101,13 +101,14 @@
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:applydetail:exportExcel")
     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);
+        ExcelExporter.build(ApplyDetail.class).exportWithSheetAndFirstAndEnd(pageData.getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","銆�"+pageWrap.getModel().getSolutionName()+"銆�"+"淇濆崟浜哄憳淇℃伅",null, "淇濆崟浜哄憳",response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")

--
Gitblit v1.9.3