From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 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 35c331f..d405af2 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
@@ -5,10 +5,10 @@
import com.doumee.config.annotation.LoginNoRequired;
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Visits;
@@ -16,10 +16,7 @@
import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
-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.*;
@@ -54,7 +51,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:visits:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.deleteById(id);
+ visitsService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -78,11 +75,27 @@
visitsService.updateById(visits);
return ApiResponse.success(null);
}
+// @ApiOperation("鎵嬪姩绛剧")
+// @GetMapping("/visitCancel")
+// @CloudRequiredPermission("business:visits:cancel")
+// public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+// visitsService.visitCancel(visitId);
+// return ApiResponse.success(null);
+// }
+
+
+ /**
+ * 2025-3-25 14:14:34 鍔犲叆鍙栨秷棰勭害 寰呭鎵广�佸鎵逛腑銆佸凡瀹℃壒
+ * @param visitId
+ * @param token
+ * @return
+ */
@ApiOperation("鍙栨秷棰勭害")
- @GetMapping("/visitCancel")
- @CloudRequiredPermission("business:visits:cancel")
- public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.visitCancel(visitId);
+ @GetMapping("/visitsCancel")
+// @CloudRequiredPermission("business:visits:cancel")
+ public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ visitsService.visitsCancel(visitId,loginUserInfo);
return ApiResponse.success(null);
}
@@ -98,7 +111,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().setReceptMemberId(getLoginUser(token).getMemberId());
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(visitsService.findPage(pageWrap));
}
@@ -106,6 +120,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);
}
@@ -141,6 +156,7 @@
visits.setMemberId(loginUserInfo.getMemberId());
visits.setCreateMemberId(loginUserInfo.getMemberId());
visits.setReceptMemberId(visits.getMemberId());
+ visits.setLoginUserInfo(loginUserInfo);
return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.visitReporting(visits));
}
--
Gitblit v1.9.3