From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java |   76 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 2 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 d1ae433..69790af 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,11 +6,14 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
+import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.model.Member;
 import com.doumee.service.business.MemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
@@ -20,7 +23,7 @@
 
 /**
  * @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
  */
 @Api(tags = "浜哄憳淇℃伅琛�")
 @RestController
@@ -36,6 +39,14 @@
     @RequiresPermissions("business:member:create")
     public ApiResponse create(@RequestBody Member member) {
         return ApiResponse.success(memberService.create(member));
+    }
+
+    @PreventRepeat
+    @ApiOperation("鍒涘缓鍔冲姟浜哄憳淇℃伅")
+    @PostMapping("/laborMemberCreate")
+    @RequiresPermissions("business:member:create")
+    public ApiResponse<Integer> laborMemberCreate(@RequestBody LaborMemberDTO member){
+        return ApiResponse.success(memberService.laborMemberCreate(member));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -67,11 +78,42 @@
         return ApiResponse.success(null);
     }
 
+    @ApiOperation("鏍规嵁ID 绂佸惎鐢�  ")
+    @PostMapping("/updateStatusById")
+    @RequiresPermissions("business:member:update")
+    public ApiResponse updateStatusById(@RequestBody Member member){
+        memberService.updateStatusById(member);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("浜哄憳鎷夐粦")
+    @PostMapping("/updateVisitsStatusById")
+    @RequiresPermissions("business:member:update")
+    public ApiResponse updateVisitsStatusById(@RequestBody Member member){
+        memberService.updateVisitsStatusById(member);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
+    @PostMapping("/updateCanVisitById")
+    @RequiresPermissions("business:member:update")
+    public ApiResponse updateCanVisitById(@RequestBody Member member){
+        memberService.updateCanVisitById(member);
+        return ApiResponse.success(null);
+    }
+
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:member:query")
     public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
         return ApiResponse.success(memberService.findPage(pageWrap));
+    }
+
+    @ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
+    @PostMapping("/findLaborMemberInfoPage")
+    @RequiresPermissions("business:member:query")
+    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
+        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
@@ -87,4 +129,34 @@
     public ApiResponse findById(@PathVariable Integer id) {
         return ApiResponse.success(memberService.findById(id));
     }
+
+
+    /**
+     *
+     * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+     * @param pageWrap
+     * @return
+     */
+    @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
+    @PostMapping("/findMemberInfoPage")
+    @RequiresPermissions("business:member:query")
+    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+        return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+    }
+
+    @ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
+    @PostMapping("/findVisitPage")
+    @RequiresPermissions("business:member:query")
+    public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+        return ApiResponse.success(memberService.findVisitPage(pageWrap));
+    }
+
+
+    @ApiOperation("寮傚父浜哄憳")
+    @PostMapping("/findUnusualPage")
+    @RequiresPermissions("business:member:query")
+    public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+        return ApiResponse.success(memberService.findUnusualPage(pageWrap));
+    }
+
 }

--
Gitblit v1.9.3