From eb53aef53bdab3eb452b95276b575bb45e616316 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期五, 15 十二月 2023 14:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 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 ba74171..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
@@ -7,6 +7,7 @@
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;
@@ -77,11 +78,27 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁ID 绂佸惎鐢� 鎷夐粦")
+ @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);
}
@@ -112,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