From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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..3ed8c63 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;
@@ -18,6 +19,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -96,6 +98,8 @@
@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());
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(visitsService.findPage(pageWrap));
}
@@ -103,6 +107,7 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:visits:exportExcel")
public void exportExcel (@RequestBody PageWrap<Visits> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
ExcelExporter.build(Visits.class).export(visitsService.findPage(pageWrap).getRecords(), "璁垮鐢宠淇℃伅琛�", response);
}
@@ -110,7 +115,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 +127,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));
}
@@ -138,7 +154,12 @@
return ApiResponse.success("閲嶇疆鎴愬姛");
}
-
-
+ @ApiOperation("閲嶆柊涓嬪彂澶辫触鐨勯绾�")
+ @GetMapping("/visitResend")
+ @CloudRequiredPermission("business:visits:update")
+ public ApiResponse visitResend(@RequestParam Integer visitId) {
+ visitsService.visitResend(visitId);
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3