Merge remote-tracking branch 'origin/master'

k94314517

2024-10-09 8f2ad5eb040a2f3f1cae62a9c099c8f5f66750e1

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java

@@ -36,7 +36,7 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:carusebook:create")
    public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token)  throws Exception {
        LoginUserInfo loginUserInfo = getLoginUser(token);
        carUseBook.setCreator(loginUserInfo.getId());
        carUseBook.setMemberId(loginUserInfo.getMemberId());
@@ -85,12 +85,12 @@
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:carusebook:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(carUseBookService.findById(id));
        return ApiResponse.success(carUseBookService.findById(id,getLoginUser(token).getMemberId()));
    }

    @ApiOperation("查询车辆预约记录")
    @PostMapping("/carUseBookList")
    public ApiResponse<List<CarUseBook>> carUseBookList (@RequestBody CarUseBook carUseBook, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<List<CarUseBook>> carUseBookList (@RequestBody CarUseBook carUseBook, @RequestHeader(Constants.HEADER_USER_TOKEN) String token)  throws Exception {
        return ApiResponse.success(carUseBookService.carUseBookList(carUseBook));
    }

@@ -102,7 +102,7 @@

    @ApiOperation("申请撤销")
    @GetMapping("/revoke")
    public ApiResponse  revoke (@RequestParam Integer id, @RequestParam String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse  revoke (@RequestParam Integer id,String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        carUseBookService.revoke(id,info,getLoginUser(token));
        return ApiResponse.success("操作成功");
    }