From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:12 +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 | 19 +++----------------
1 files changed, 3 insertions(+), 16 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 3a44e45..f2d0c6f 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
@@ -18,15 +18,14 @@
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberCard;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
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;
@@ -264,29 +263,17 @@
return ApiResponse.success(memberService.findDriveList(model));
}
-
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:member:exportExcel")
- public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ 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();
+ 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);
}
--
Gitblit v1.9.3