admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

车辆预约判断状态bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-07-24 18:29:19 +08:00
parent d133211275
commit 8de4e31035
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
View File

@ -183,6 +183,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
List<CarInfoApprovalFlow> flows = carInfoApprovalFlowMapper.selectList(new LambdaQueryWrapper<CarInfoApprovalFlow>() List<CarInfoApprovalFlow> flows = carInfoApprovalFlowMapper.selectList(new LambdaQueryWrapper<CarInfoApprovalFlow>()
.eq(CarInfoApprovalFlow::getProjectSn, c.getProjectSn()) .eq(CarInfoApprovalFlow::getProjectSn, c.getProjectSn())
.eq(CarInfoApprovalFlow::getCarNumber, c.getCarNumber()) .eq(CarInfoApprovalFlow::getCarNumber, c.getCarNumber())
.last(Cts.IGNORE_DATA_SCOPE_CONDITION)
); );
List<CarInfoApprovalFlow> otherFlows = flows.stream().filter(f -> !Objects.equals(c.getEnterpriseId(), f.getEnterpriseId())).collect(Collectors.toList()); List<CarInfoApprovalFlow> otherFlows = flows.stream().filter(f -> !Objects.equals(c.getEnterpriseId(), f.getEnterpriseId())).collect(Collectors.toList());
boolean overlap = otherFlows.stream().anyMatch(f -> DateUtil.compare(f.getReserveStartTime(), c.getReserveEndTime()) < 0 && DateUtil.compare(f.getReserveEndTime(), c.getReserveStartTime()) > 0); boolean overlap = otherFlows.stream().anyMatch(f -> DateUtil.compare(f.getReserveStartTime(), c.getReserveEndTime()) < 0 && DateUtil.compare(f.getReserveEndTime(), c.getReserveStartTime()) > 0);
@ -503,7 +504,8 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
carInfo.setEnterpriseId(workerInfo.getEnterpriseId()); carInfo.setEnterpriseId(workerInfo.getEnterpriseId());
QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn()) queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
.eq(CarInfo::getCarNumber, carInfo.getCarNumber()); .eq(CarInfo::getCarNumber, carInfo.getCarNumber())
.last(Cts.IGNORE_DATA_SCOPE_CONDITION);
CarInfo old = this.getOne(queryWrapper); CarInfo old = this.getOne(queryWrapper);
if (old != null && Objects.equals(old.getIsBlack(), 1)) { if (old != null && Objects.equals(old.getIsBlack(), 1)) {
map.put("success", false); map.put("success", false);