From 6e41324f84f0cf70871ca05292c5420bdcaaa98c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/MemberController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..fafd693 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;
@@ -79,21 +80,28 @@
@PostMapping("/page")
@RequiresPermissions("business:member:query")
public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<MemberQueryDTO> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- pageWrap.getModel().setCompanyId(user.getCompanyId());
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+// pageWrap.getModel().setCompanyId(user.getCompanyId());
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();
+ /* 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( memberService.findPageForCompany(pageWrap).getRecords(), "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
}
+
+
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:member:query")
--
Gitblit v1.9.3