From 5ed3700013b2c653bbab897c970182c1af39ce15 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 02 二月 2024 14:38:21 +0800
Subject: [PATCH] 111

---
 server/company/src/main/java/com/doumee/api/business/MemberController.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index b49c83e..0efc59a 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -11,6 +11,7 @@
 import com.doumee.dao.business.dto.MemberImport;
 import com.doumee.dao.business.dto.MemberQueryDTO;
 import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberInsurance;
 import com.doumee.service.business.MemberService;
 import io.swagger.annotations.*;
 import org.apache.shiro.SecurityUtils;
@@ -84,16 +85,23 @@
         return ApiResponse.success(memberService.findPageForCompany(pageWrap));
     }
 
-
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:member:exportExcel")
     public void exportExcel (@RequestBody PageWrap<MemberQueryDTO> pageWrap, HttpServletResponse response) {
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         pageWrap.getModel().setCompanyId(user.getCompanyId());
-        ExcelExporter.build(Member.class).export(memberService.findPageForCompany(pageWrap).getRecords(), "鐢ㄥ伐淇℃伅琛�", response);
+        List<Member> list = memberService.findPageForCompany(pageWrap).getRecords();
+        for (int i = 0; i < list.size(); i++) {
+            Member member = list.get(i);
+            member.setSn(i+1);
+            member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
+        }
+        ExcelExporter.build(Member.class).exportWithFirstAndEnd(list, "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
     }
 
+
+
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @RequiresPermissions("business:member:query")

--
Gitblit v1.9.3