From 30a14783481d100a6503a56c902b47182e542c93 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 08 十二月 2023 15:42:09 +0800
Subject: [PATCH] #组织树 和企业下的人员信息 人员卡信息
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 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..9fc2c03 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,26 @@
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")
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 +113,18 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(memberService.findById(id));
}
+
+
+ /**
+ *
+ * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+ * @param pageWrap
+ * @return
+ */
+ @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
+ @GetMapping("/findMemberInfoPage")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+ return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ }
}
--
Gitblit v1.9.3