Merge remote-tracking branch 'origin/master'

jiangping

2025-03-27 7b51c9e1abc198a501f7858599da9c116130fd6f

 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,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);
    }