|
@@ -77,10 +77,11 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
|
|
|
public List<KwcContractLogistics> queryValidByEntId(Long entId) {
|
|
public List<KwcContractLogistics> queryValidByEntId(Long entId) {
|
|
|
return list(Wrappers.<KwcContractLogistics>lambdaQuery()
|
|
return list(Wrappers.<KwcContractLogistics>lambdaQuery()
|
|
|
.eq(KwcContractLogistics::getEntId, entId)
|
|
.eq(KwcContractLogistics::getEntId, entId)
|
|
|
|
|
+ .eq(KwcContractLogistics::getDispatchWay, 2)
|
|
|
.eq(KwcContractLogistics::getDelFlag, 0)
|
|
.eq(KwcContractLogistics::getDelFlag, 0)
|
|
|
.eq(KwcContractLogistics::getStatus, 0)
|
|
.eq(KwcContractLogistics::getStatus, 0)
|
|
|
.and(queryWrapper -> queryWrapper.apply("{0} between start_time and end_time",new Date())
|
|
.and(queryWrapper -> queryWrapper.apply("{0} between start_time and end_time",new Date())
|
|
|
- //.or(queryWrapper1->queryWrapper1.le(KwcContractLogistics::getStartTime, new Date()).isNull(KwcContractLogistics::getEndTime))
|
|
|
|
|
|
|
+ .or(queryWrapper1->queryWrapper1.le(KwcContractLogistics::getStartTime, new Date()).isNull(KwcContractLogistics::getEndTime))
|
|
|
));
|
|
));
|
|
|
}
|
|
}
|
|
|
|
|
|