|
@@ -262,7 +262,7 @@ public class OrderBaseLogic {
|
|
|
)
|
|
|
|
|
|
)
|
|
|
- .eq(CollectionUtils.isNotEmpty(orderStatusList) && !orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,true)
|
|
|
+ .eq(CollectionUtils.isNotEmpty(orderStatusList) && !orderStatusList.contains("DJD") && !orderStatusList.contains("DCL"),PgOrderBase::getIsMeet,true)
|
|
|
.eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)
|
|
|
.between(!StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())
|
|
|
&& StringUtils.isNoneBlank(startTime, endTime) && (byDay == null || byDay != 3), PgOrderBase::getDispatchTime, startTime, endTime)
|