From b59fc5522771bba6b5cae1ff7f7f0a47fd3f8584 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 043b24e..a64efdb 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
@@ -89,9 +90,14 @@
@ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
@PostMapping("/updateRemoveStatusById")
@RequiresPermissions("business:member:update")
- public ApiResponse updateRemoveStatusById(@RequestParam List<Member> list){
- memberService.updateRemoveStatusById(list);
- return ApiResponse.success(null);
+ public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
+ if(list.size()>0){
+ memberService.updateRemoveStatusById(list);
+ return ApiResponse.success(null);
+ }else{
+ return ApiResponse.failed("鍙傛暟閿欒");
+ }
+
}
@ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
@@ -101,6 +107,21 @@
memberService.updateVisitsStatusById(member);
return ApiResponse.success(null);
}
+
+
+ @ApiOperation("鎵归噺鎷夐粦/鍐荤粨")
+ @GetMapping("/batchBlock")
+ @RequiresPermissions("business:member:delete")
+ public ApiResponse batchBlock(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ memberService.batchBlock(idList);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@PostMapping("/updateCanVisitById")
@@ -149,7 +170,13 @@
@PostMapping("/findMemberInfoPage")
@RequiresPermissions("business:member:query")
public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
- return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
+ return ApiResponse.success(memberService.findVisitPage(pageWrap));
+ }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
+ return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ }else {
+ return ApiResponse.success(null);
+ }
}
@ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
@@ -167,6 +194,11 @@
return ApiResponse.success(memberService.findUnusualPage(pageWrap));
}
-
+ @ApiOperation("鏍规嵁绫诲瀷鏌ヨ浜哄憳淇℃伅")
+ @PostMapping("/findTypeMemberInfo")
+ //@RequiresPermissions("business:member:query")
+ public ApiResponse<List<Member>> findTypeMemberInfo (@RequestBody Member member) {
+ return ApiResponse.success(memberService.findList(member));
+ }
}
--
Gitblit v1.9.3