From a7fb50c91e4932aa175be266fbdd42b2a70eba66 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 22 五月 2024 18:11:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
index d191818..7657b26 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
@@ -5,10 +5,12 @@
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.core.utils.Constants;
import com.doumee.dao.business.model.CarUseBook;
+import com.doumee.dao.business.vo.DateIntervalVO;
import com.doumee.service.business.CarUseBookService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +18,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @since 2024/04/28 16:06
@@ -33,6 +37,9 @@
@PostMapping("/create")
@CloudRequiredPermission("business:carusebook:create")
public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ carUseBook.setCreator(loginUserInfo.getId());
+ carUseBook.setMemberId(loginUserInfo.getMemberId());
return ApiResponse.success(carUseBookService.create(carUseBook));
}
@@ -80,4 +87,17 @@
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(carUseBookService.findById(id));
}
+
+ @ApiOperation("鏌ヨ杞﹁締棰勭害璁板綍")
+ @PostMapping("/carUseBookList")
+ public ApiResponse<List<CarUseBook>> carUseBookList (@RequestBody CarUseBook carUseBook, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(carUseBookService.carUseBookList(carUseBook));
+ }
+
+ @ApiOperation("鏌ヨ杞﹁締鍙绾︽椂娈�")
+ @GetMapping("/carCanReservationDate")
+ public ApiResponse<List<DateIntervalVO>> carCanReservationDate (@RequestParam Integer carId, @RequestParam String dateDay, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(carUseBookService.checkDateUse(carId,dateDay));
+ }
+
}
--
Gitblit v1.9.3