From e669ae9c74cd808e7ca8fb066d59b47296467b0e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 13 八月 2024 14:21:01 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java index c7edc30..8e69cbf 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java @@ -6,6 +6,7 @@ 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.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; @@ -96,6 +97,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:visits:query") public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId()); return ApiResponse.success(visitsService.findPage(pageWrap)); } @@ -110,7 +112,8 @@ @GetMapping("/{id}") @CloudRequiredPermission("business:visits:query") public ApiResponse<Visits> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - return ApiResponse.success(visitsService.findById(id)); + LoginUserInfo loginUserInfo = getLoginUser(token); + return ApiResponse.success(visitsService.findById(id,loginUserInfo.getMemberId())); } @ApiOperation("婊炵暀浜哄憳") @@ -121,12 +124,22 @@ return ApiResponse.success(visitsService.retentionPage(pageWrap)); } + @ApiOperation(value = "PC绔瀹㈣褰曟彁浜�", notes = "璁垮鎻愪氦") + @PostMapping("/createFk") + public ApiResponse createFk(@RequestBody Visits visits) { + visits.setSourceType(Constants.ZERO); + return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false,Constants.ONE)); + } + @ApiOperation(value = "璁垮鎶ュ", notes = "璁垮鎶ュ") @PostMapping("/createVisit") public ApiResponse createVisit(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - visits.setMemberId(getLoginUser(token).getMemberId()); + LoginUserInfo loginUserInfo = getLoginUser(token); + visits.setMemberId(loginUserInfo.getMemberId()); + visits.setCreateMemberId(loginUserInfo.getMemberId()); + visits.setReceptMemberId(visits.getMemberId()); return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.visitReporting(visits)); } -- Gitblit v1.9.3