From 103b6919cb294533920dc9508e855ffca51f71e5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 31 十月 2024 18:20:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 7343cc6..3a44e45 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
@@ -24,7 +24,9 @@
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -266,8 +268,26 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:member:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
+ 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);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -293,6 +313,7 @@
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
}else {
return ApiResponse.success(null);
--
Gitblit v1.9.3