From 17fe60cacd5c6f944cb0a5f3da3ae0a90832e3b4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 17:05:14 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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 4c324ed..ef865c4 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,6 +76,7 @@
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(CarUseBook carUseBook) throws Exception {
if(Objects.isNull(carUseBook)
|| Objects.isNull(carUseBook.getCarId())
@@ -122,6 +124,7 @@
}
carUseBookMapper.insert(carUseBook);
//鐢ㄨ溅鐢宠 瀹℃壒璁板綍鍒涘缓
+
approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId());
return carUseBook.getId();
}
@@ -182,13 +185,14 @@
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
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)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- Member member = memberMapper.selectById(model.getCancelUser());
+ Member member1 = memberMapper.selectById(model.getCancelUser());
+
Approve approve = new Approve();
approve.setApproveType(Constants.ZERO);
approve.setCreateDate(model.getCancelTime());
@@ -196,9 +200,11 @@
approve.setStatusInfo("宸叉挙閿�");
approve.setStatus(Constants.FOUR);
approve.setType(Constants.ZERO);
- approve.setMemberName(member.getName());
- if(StringUtils.isNotBlank(member.getFaceImg())){
- approve.setFaceImg(path + member.getFaceImg());
+ if(member1!=null) {
+ approve.setMemberName(member1.getName());
+ if (StringUtils.isNotBlank(member1.getFaceImg())) {
+ approve.setFaceImg(path + member1.getFaceImg());
+ }
}
approve.setCheckInfo(model.getCancelInfo());
approveList.add(approve);
@@ -365,23 +371,23 @@
.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(DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
+ dateIntervalVO.setIsUse(Constants.ONE);
+ continue;
+ }
+ 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.setIsUse(Constants.ONE);
break;
--
Gitblit v1.9.3