From 9a46f15cec245d1efe7c5539dc6b2f38e4980f8a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 11:48:19 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 bb9a85a..6386c16 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
@@ -20,6 +20,7 @@
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.business.vo.MemberExcelVO;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
@@ -27,6 +28,7 @@
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -44,7 +46,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/member")
public class MemberCloudController extends BaseController {
- @Autowired
+// @Autowired
private ERPSyncService erpSyncService;
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@@ -382,7 +384,7 @@
@CloudRequiredPermission("business:member:create")
public ApiResponse ywCreate(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
member.setLoginUserInfo(this.getLoginUser(token));
- memberService.create(member);
+ memberService.ywCreate(member);
return ApiResponse.success("鎿嶄綔鎴愬姛锛�");
}
@@ -406,10 +408,24 @@
@ApiOperation("闃滃畞杩愮淮 - 鍒嗛〉鏌ヨ")
- @PostMapping("/page")
+ @PostMapping("/ywFindPage")
@CloudRequiredPermission("business:member:query")
public ApiResponse<PageData<Member>> ywFindPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.ywFindPage(pageWrap));
}
+
+ @ApiOperation("闃滃畞 - 瀵煎嚭Excel")
+ @PostMapping("/ywExportExcel")
+ @CloudRequiredPermission("business:member:exportExcel")
+ public void ywExportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ List<Member> memberList = memberService.ywFindPage(pageWrap).getRecords();
+ List<MemberExcelVO> memberExcelVOList = new ArrayList<MemberExcelVO>();
+ for (Member member:memberList) {
+ MemberExcelVO memberExcelVO = new MemberExcelVO();
+ BeanUtils.copyProperties(member,memberExcelVO);
+ memberExcelVOList.add(memberExcelVO);
+ }
+ ExcelExporter.build(MemberExcelVO.class).export(memberExcelVOList, "浜哄憳淇℃伅琛�", response);
+ }
}
--
Gitblit v1.9.3