From 45271bc891546c395acd312b95524b98ae8d9c31 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:05:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index d8220d6..41e4b0b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -267,6 +267,26 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:member:exportExcel")
public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ List<Member> memberList = new ArrayList<>();
+ if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
+ memberList = memberService.findVisitPage(pageWrap).getRecords();
+ }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+ memberList = memberService.findMemberInfoPage(pageWrap).getRecords();
+ }
+ if(CollectionUtils.isNotEmpty(memberList)){
+ for (Member member:memberList) {
+ if(StringUtils.isNotBlank(member.getFaceImg())){
+ member.setHavaFaceImg(Constants.ONE);
+ }else{
+ member.setHavaFaceImg(Constants.ZERO);
+ }
+
+ }
+ }
+
+ ExcelExporter.build(Member.class).export(memberList, "浜哄憳淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
// pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
// return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
ExcelExporter.build(Member.class).export(memberService.findMemberInfoPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
--
Gitblit v1.9.3