From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 53 ++++++++++++-----------------------------------------
1 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index a565622..b0fd533 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -3,13 +3,12 @@
import com.doumee.config.DataSyncConfig;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.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;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.MemberService;
@@ -63,7 +62,7 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("business:member:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- memberService.deleteById(id);
+ memberService.deleteById(id,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -76,7 +75,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- memberService.deleteByIdInBatch(idList);
+ memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -84,7 +83,7 @@
@GetMapping("/roleAuth/{id}")
@RequiresPermissions("business:empower:create")
public ApiResponse roleAuthById(@PathVariable Integer id) {
- memberService.roleAuthById(id);
+ memberService.roleAuthById(id,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -123,28 +122,6 @@
return ApiResponse.success(null);
}
- @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
- @PostMapping("/updateRemoveStatusById")
- @RequiresPermissions("business:member:update")
- public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
- if(list.size()>0){
- memberService.updateRemoveStatusById(list);
- return ApiResponse.success(null);
- }else{
- return ApiResponse.failed("鍙傛暟閿欒");
- }
-
- }
-
- @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
- @PostMapping("/updateVisitsStatusById")
- @RequiresPermissions("business:member:update")
- public ApiResponse updateVisitsStatusById(@RequestBody Member member){
- memberService.updateVisitsStatusById(member);
- return ApiResponse.success(null);
- }
-
-
@ApiOperation("鎵归噺鎷夐粦")
@GetMapping("/batchBlock")
@RequiresPermissions("business:member:delete")
@@ -154,7 +131,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,2);
+ memberService.batchBlock(idList,2,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -167,7 +144,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,1);
+ memberService.batchBlock(idList,1,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -188,12 +165,6 @@
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")
@@ -221,7 +192,7 @@
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+ public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -234,7 +205,7 @@
@ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
@PostMapping("/findVisitPage")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}
@@ -242,7 +213,7 @@
@ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
@PostMapping("/findUnusualPage")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
return ApiResponse.success(memberService.findUnusualPage(pageWrap));
}
@@ -260,7 +231,7 @@
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
erpSyncService.syncUsers(null);
}else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
- hkSyncOrgUserFHKService.syncUserData();
+ hkSyncOrgUserFHKService.syncUserData(this.getLoginUser(null));
}
return ApiResponse.success("鍚屾鎴愬姛");
}
--
Gitblit v1.9.3