From 766089ad50ae807ab88ba83b2dbc4a53bda8e423 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十二月 2023 18:27:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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 181333b..ba74171 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,13 @@
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.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;
@@ -36,6 +38,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,6 +77,14 @@
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("/page")
@RequiresPermissions("business:member:query")
@@ -74,6 +92,13 @@
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")
@PostMapping("/exportExcel")
@RequiresPermissions("business:member:exportExcel")
--
Gitblit v1.9.3