From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index ece9591..4569482 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -29,6 +29,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
@@ -75,13 +76,13 @@
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(CarUseBook carUseBook) throws Exception {
if(Objects.isNull(carUseBook)
|| Objects.isNull(carUseBook.getCarId())
|| Objects.isNull(carUseBook.getStartTime())
|| Objects.isNull(carUseBook.getEndTime())
|| Objects.isNull(carUseBook.getCreator())
- || Objects.isNull(carUseBook.getMemberId())
|| Objects.isNull(carUseBook.getPlanUseDate())
|| Objects.isNull(carUseBook.getType())
|| StringUtils.isEmpty(carUseBook.getMemberIds())
@@ -90,6 +91,9 @@
|| StringUtils.isEmpty(carUseBook.getAddr())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(Objects.nonNull(carUseBook.getCreator())&&Objects.isNull(carUseBook.getMemberId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐧诲綍鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�!");
}
if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
@@ -103,9 +107,10 @@
carUseBook.setCreateDate(new Date());
carUseBook.setIsdeleted(Constants.ZERO);
Cars cars = carsMapper.selectById(carUseBook.getCarId());
- if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){
+ if(Objects.isNull(cars)||!cars.getType().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締淇℃伅寮傚父");
}
+ carUseBook.setCarCode(cars.getCode());
//鏍规嵁杞﹁締鏌ヨ鍙告満淇℃伅
CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
.eq(CarDriver::getCarId,cars.getId())
@@ -181,8 +186,11 @@
.eq(CarUseBook::getId,id)
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
+ if(Objects.isNull(model)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
- model.getType().equals(Constants.ZERO)?3:4,
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
memberId);
List<Approve> approveList = approveDataVO.getApproveList();
if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
@@ -204,6 +212,7 @@
}
}
approve.setCheckInfo(model.getCancelInfo());
+ approve.setCheckDate(model.getCancelTime());
approveList.add(approve);
}
model.setApproveDateVO(approveDataVO);
@@ -368,28 +377,29 @@
.or().like(CarUseBook::getEndTime,dateDay)
.or().apply(" START_TIME < '"+dateDay+" 00:00:00' and END_TIME > '"+dateDay+" 23:59:59' "))
);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
- for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
- //鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
- if(DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
- dateIntervalVO.setIsUse(Constants.ONE);
- continue;
- }
+ for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
for (CarUseBook i:carUseBookList ) {
if(
- (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() <= i.getStartTime().getTime() &&
- i.getStartTime().getTime() < DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
- ||
- (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() < i.getEndTime().getTime() &&
- i.getEndTime().getTime() <= DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
- ||
- (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() &&
- DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime())
+ (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() <= i.getStartTime().getTime() &&
+ i.getStartTime().getTime() < DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
+ ||
+ (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() < i.getEndTime().getTime() &&
+ i.getEndTime().getTime() <= DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
+ ||
+ (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() &&
+ DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime())
){
+ dateIntervalVO.setCarUseBookId(i.getId());
dateIntervalVO.setIsUse(Constants.ONE);
break;
}
}
+ }
+ //鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
+ if(Constants.equalsInteger(dateIntervalVO.getIsUse(),Constants.ZERO) && DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
+ dateIntervalVO.setIsUse(Constants.ONE);
+ continue;
}
}
return dateIntervalVOList;
@@ -433,7 +443,7 @@
carUseBook.setCancelTime(new Date());
carUseBook.setCancelStatus(Constants.ONE);
carUseBook.setStatus(Constants.FOUR);
- carUseBook.setCancelUser(loginUserInfo.getId());
+ carUseBook.setCancelUser(loginUserInfo.getMemberId());
carUseBook.setCancelType(Constants.ONE);
if(loginUserInfo.getId().equals(carUseBook.getCreator())){
carUseBook.setCancelType(Constants.ZERO);
--
Gitblit v1.9.3