From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 159 ++++++++++++++++++++++++++--------------------------
1 files changed, 79 insertions(+), 80 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 2b41210..fba319f 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
@@ -11,6 +11,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveMapper;
+import com.doumee.dao.business.CarDriverMapper;
import com.doumee.dao.business.CarUseBookMapper;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.join.ApproveJoinMapper;
@@ -18,6 +19,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.DateIntervalVO;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.CarUseBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -66,9 +68,12 @@
@Autowired
private ApproveService approveService;
+ @Autowired
+ private CarDriverMapper carDriverMapper;
+
@Override
- public Integer create(CarUseBook carUseBook) {
+ public Integer create(CarUseBook carUseBook) throws Exception {
if(Objects.isNull(carUseBook)
|| Objects.isNull(carUseBook.getCarId())
|| Objects.isNull(carUseBook.getStartTime())
@@ -84,31 +89,33 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
+ }
+ if(!(DateUtil.getDateFromString(carUseBook.getPlanUseDate()+":00").getTime()>=carUseBook.getStartTime().getTime()
+ && DateUtil.getDateFromString(carUseBook.getPlanUseDate() +":00").getTime()<= carUseBook.getEndTime().getTime())
+ ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍑哄彂鏃堕棿閿欒");
+ }
carUseBook.setStatus(Constants.ZERO);
carUseBook.setCreateDate(new Date());
+ carUseBook.setIsdeleted(Constants.ZERO);
Cars cars = carsMapper.selectById(carUseBook.getCarId());
if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締淇℃伅寮傚父");
}
- //鏌ヨ杞﹁締鎻愪氦鏃堕棿鏄惁瀛樺湪鍐茬獊鐨勯绾﹁褰�
- List<CarUseBook> carUseBookList = carUseBookJoinMapper.selectJoinList(CarUseBook.class,
- new MPJLambdaWrapper<CarUseBook>()
- .selectAll(CarUseBook.class)
- .selectAs(Member::getName,CarUseBook::getMemberName)
- .selectAs(Member::getPhone,CarUseBook::getMemberMobile)
- .leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
- .eq(CarUseBook::getId,carUseBook.getCarId())
- .in(CarUseBook::getStatus,0,1,2)
- .and(i->i.and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getStartTime,carUseBook.getStartTime()))
- .or()
- .and(j->j.lt(CarUseBook::getEndTime,carUseBook.getEndTime()).gt(CarUseBook::getEndTime,carUseBook.getStartTime()))
- .or()
- .and(j->j.gt(CarUseBook::getStartTime,carUseBook.getStartTime()).lt(CarUseBook::getEndTime,carUseBook.getEndTime()))
- .or()
- .and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getEndTime,carUseBook.getEndTime()))
- )
+ //鏍规嵁杞﹁締鏌ヨ鍙告満淇℃伅
+ CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getCarId,cars.getId())
+ .eq(CarDriver::getIsdeleted,Constants.ZERO)
+ .eq(CarDriver::getStatus,Constants.ONE)
+ .last( " limit 1 ")
);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
+ if(Objects.nonNull(carDriver)&&Objects.nonNull(carDriver.getMemberId())){
+ carUseBook.setDriverId(carDriver.getMemberId());
+ }
+ //鏌ヨ杞﹁締鎻愪氦鏃堕棿鏄惁瀛樺湪鍐茬獊鐨勯绾﹁褰�
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(this.carUseBookList(carUseBook))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪杞﹁締棰勭害鏃堕棿涓庡凡棰勭害鏃堕棿鍐茬獊~");
}
carUseBookMapper.insert(carUseBook);
@@ -151,36 +158,32 @@
}
}
+ /**
+ *
+ * @param id 涓婚敭
+ * @param memberId
+ * @return
+ */
@Override
- public CarUseBook findById(Integer id) {
+ public CarUseBook findById(Integer id,Integer memberId) {
MPJLambdaWrapper<CarUseBook> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(CarUseBook.class);
queryWrapper.select("t1.name",CarUseBook::getMemberName);
queryWrapper.select("t1.phone",CarUseBook::getMemberPhone);
queryWrapper.select("t2.name",CarUseBook::getDriverName);
- queryWrapper.select("t3.phone",CarUseBook::getDriverPhone);
+ queryWrapper.select("t2.phone",CarUseBook::getDriverPhone);
queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
- .leftJoin("company t4 on t1.company_id=t4.id")
.leftJoin(Member.class,Member::getId,CarUseBook::getDriverId)
+ .leftJoin("company t4 on t1.company_id=t4.id")
.eq(CarUseBook::getId,id)
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
- //瀹℃壒璁板綍
- List<Approve> approveList = approveJoinMapper.selectJoinList(Approve.class,
- new MPJLambdaWrapper<Approve>()
- .selectAll(Approve.class)
- .selectAs(Member::getName,Approve::getMemberName)
- .selectAs(Member::getPhone,Approve::getMemberPhone)
- .selectAs(Company::getName,Approve::getCompanyName)
- .leftJoin(Member.class,Member::getId,Approve::getChekorId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Approve::getIsdeleted,Constants.ZERO)
- .eq(Approve::getObjType,Constants.ONE)
- .eq(Approve::getObjId,id)
- .orderByAsc(Approve::getLevel)
+ model.setApproveDateVO(
+ approveService.arrangeApprovedData(id,
+ model.getType().equals(Constants.ZERO)?3:4,
+ memberId)
);
- model.setApproveList(approveList);
return model;
}
@@ -206,11 +209,11 @@
queryWrapper.select("t1.name",CarUseBook::getMemberName);
queryWrapper.select("t1.phone",CarUseBook::getMemberPhone);
queryWrapper.select("t2.name",CarUseBook::getDriverName);
- queryWrapper.select("t3.phone",CarUseBook::getDriverPhone);
+ queryWrapper.select("t2.phone",CarUseBook::getDriverPhone);
queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
- .leftJoin("company t4 on t1.company_id=t4.id")
- .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId);
+ .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId)
+ .leftJoin("company t4 on t1.company_id=t4.id");
queryWrapper
.eq(pageWrap.getModel().getId() != null, CarUseBook::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, CarUseBook::getCreator, pageWrap.getModel().getCreator())
@@ -246,19 +249,12 @@
.eq(pageWrap.getModel().getAddr() != null, CarUseBook::getAddr, pageWrap.getModel().getAddr())
.eq(pageWrap.getModel().getMemberId() != null, CarUseBook::getMemberId, pageWrap.getModel().getMemberId())
.eq(pageWrap.getModel().getDriverId() != null, CarUseBook::getDriverId, pageWrap.getModel().getDriverId())
- .and(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()),
- i->i.and(j->j.lt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"00:00:00").gt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"23:59:59"))
- .or()
- .and(j->j.lt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"23:59:59").gt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"00:00:00"))
- .or()
- .and(j->j.gt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"00:00:00").lt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"23:59:59"))
- .or()
- .and(j->j.lt(CarUseBook::getStartTime,pageWrap.getModel().getQueryDate() +"00:00:00").gt(CarUseBook::getEndTime,pageWrap.getModel().getQueryDate() +"23:59:59"))
- )
+ .apply(pageWrap.getModel().getCompanyName() != null, "t4.company_name_path like '%"+pageWrap.getModel().getCompanyName()+"%'")
+
.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
- .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), Empower::getCreateDate,pageWrap.getModel().getQueryStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),Empower::getCreateDate,pageWrap.getModel().getQueryEndTime())
+ .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), CarUseBook::getPlanUseDate,pageWrap.getModel().getQueryStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),CarUseBook::getPlanUseDate,pageWrap.getModel().getQueryEndTime())
.orderByDesc(Visits::getCreateDate)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -284,7 +280,7 @@
* @return
*/
@Override
- public List<CarUseBook> carUseBookList(CarUseBook carUseBook){
+ public List<CarUseBook> carUseBookList(CarUseBook carUseBook) throws Exception {
if(Objects.isNull(carUseBook)
|| Objects.isNull(carUseBook.getCarId())
|| Objects.isNull(carUseBook.getStartTime())
@@ -297,16 +293,15 @@
.selectAs(Member::getName,CarUseBook::getMemberName)
.selectAs(Member::getPhone,CarUseBook::getMemberMobile)
.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
- .eq(CarUseBook::getId,carUseBook.getCarId())
+ .eq(CarUseBook::getCarId,carUseBook.getCarId())
.in(CarUseBook::getStatus,0,1,2)
- .and(i->i.and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getStartTime,carUseBook.getStartTime()))
- .or()
- .and(j->j.lt(CarUseBook::getEndTime,carUseBook.getStartTime()).gt(CarUseBook::getEndTime,carUseBook.getStartTime()))
- .or()
- .and(j->j.gt(CarUseBook::getStartTime,carUseBook.getStartTime()).lt(CarUseBook::getEndTime,carUseBook.getEndTime()))
- .or()
- .and(j->j.lt(CarUseBook::getStartTime,carUseBook.getStartTime()).gt(CarUseBook::getEndTime,carUseBook.getEndTime()))
- )
+ .apply(" ( " +
+ " '"+DateUtil.getPlusTime(carUseBook.getStartTime())+"' <= t.start_time AND t.start_time < '"+DateUtil.getPlusTime(carUseBook.getEndTime())+"' " +
+ " or " +
+ " ( '"+DateUtil.getPlusTime(carUseBook.getStartTime())+"' < t.end_time AND t.end_time < '"+DateUtil.getPlusTime(carUseBook.getEndTime())+"' ) " +
+ " or " +
+ " ( '"+DateUtil.getPlusTime(carUseBook.getStartTime())+"' > t.start_time AND '"+DateUtil.getPlusTime(carUseBook.getEndTime())+"' < t.end_time )" +
+ " ) " )
);
return carUseBookList;
}
@@ -331,8 +326,8 @@
||Objects.isNull(interval.getCode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閰嶇疆閿欒锛岃鑱旂郴绠＄悊鍛�");
}
- Date startTime = DateUtil.StringToDate(dateDay + workStart.getCode(),"yyyy-MM-dd HH:mm:ss");
- Date endTime = DateUtil.StringToDate(dateDay + workEnd.getCode(),"yyyy-MM-dd HH:mm:ss");
+ Date startTime = DateUtil.StringToDate((dateDay + " " +workStart.getCode()),"yyyy-MM-dd HH:mm:ss");
+ Date endTime = DateUtil.StringToDate(dateDay + " " + workEnd.getCode(),"yyyy-MM-dd HH:mm:ss");
Long intervalTime = Long.valueOf(interval.getCode());
LocalDateTime localStartTime = startTime.toInstant()
.atZone(ZoneId.systemDefault())
@@ -346,29 +341,32 @@
.eq(CarUseBook::getIsdeleted,Constants.ZERO)
.eq(CarUseBook::getCarId,cars)
.in(CarUseBook::getStatus,0,1,2)
- .and(i->i.like(CarUseBook::getStartTime,dateDay).or().like(CarUseBook::getEndTime,dateDay)
+ .and(i->i.like(CarUseBook::getStartTime,dateDay)
+ .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(
- carUseBookList.stream().filter(
- i->
- ( i.getStartTime().getTime()<DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime()
- && i.getEndTime().getTime() > DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime())
- ||
- ( i.getStartTime().getTime()<DateUtil.stringToDate(dateIntervalVO.getEndTime(),"yyyy-MM-dd HH:mm:ss ").getTime()
- && i.getEndTime().getTime() > DateUtil.stringToDate(dateIntervalVO.getEndTime(),"yyyy-MM-dd HH:mm:ss ").getTime())
- ||
- ( DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() < i.getStartTime().getTime()
- && DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() > i.getStartTime().getTime())
- ||
- ( DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() < i.getEndTime().getTime()
- && DateUtil.stringToDate(dateIntervalVO.getStartTime(),"yyyy-MM-dd HH:mm:ss ").getTime() > i.getEndTime().getTime())
-
- ).collect(Collectors.toList()).size()>Constants.ZERO){
+ //鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
+ if(DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
dateIntervalVO.setIsUse(Constants.ONE);
- };
+ continue;
+ }
+ 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())
+ ){
+ dateIntervalVO.setIsUse(Constants.ONE);
+ break;
+ }
+ }
}
}
return dateIntervalVOList;
@@ -396,6 +394,7 @@
dateIntervalVO.setStartTime(startTime);
dateIntervalVO.setEndTime(endTime);
dateIntervalVO.setIsUse(Constants.ZERO);
+ dateIntervalVOList.add(dateIntervalVO);
}
return dateIntervalVOList;
}
--
Gitblit v1.9.3