From 165078645b8cfe800aeda7206e89ebd901c7e6c8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 18:13:54 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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..a88a33d 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;
@@ -102,6 +103,21 @@
         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")
     @RequiresPermissions("business:member:update")
@@ -149,7 +165,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("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")

--
Gitblit v1.9.3