From 92aac24e1045295cd555d6a00985f9dedaf1bcea Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 26 三月 2025 09:30:09 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 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 3ed8c63..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
@@ -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,26 @@
         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){
         visitsService.visitCancel(visitId);
+        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);
     }
 
@@ -143,6 +155,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