From 12769ff64ea1f52d6a0a45f53b6acd336fe234fc Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 26 三月 2025 09:30:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 19 +++++++++++++++++--
1 files changed, 17 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 a635e08..a27e759 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
@@ -51,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);
}
@@ -75,7 +75,7 @@
visitsService.updateById(visits);
return ApiResponse.success(null);
}
- @ApiOperation("鍙栨秷棰勭害")
+ @ApiOperation("鎵嬪姩绛剧")
@GetMapping("/visitCancel")
@CloudRequiredPermission("business:visits:cancel")
public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
@@ -83,6 +83,21 @@
return ApiResponse.success(null);
}
+
+ /**
+ * 2025-3-25 14:14:34 鍔犲叆鍙栨秷棰勭害 寰呭鎵广�佸鎵逛腑銆佸凡瀹℃壒
+ * @param visitId
+ * @param token
+ * @return
+ */
+ @ApiOperation("鍙栨秷棰勭害")
+ @GetMapping("/visitsCancel")
+ @CloudRequiredPermission("business:visits:cancel")
+ public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ visitsService.visitsCancel(visitId);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鏍规嵁鏃ユ湡(starttime)鍚屾璁垮鏁版嵁")
@PostMapping("/syncByDate")
@CloudRequiredPermission("business:visits:sync")
--
Gitblit v1.9.3