|
@@ -247,7 +247,7 @@ public class OrderBaseLogic {
|
|
|
)
|
|
|
.notIn(orderStatus != null && orderStatus.equals(OrderBaseStatusEnum.DCL.getKey()),PgOrderBase::getOrderStatus,
|
|
|
OrderBaseStatusEnum.YWG.getKey(),OrderBaseStatusEnum.YWGO.getKey(),OrderBaseStatusEnum.GCSZX.getKey(),
|
|
|
- OrderBaseStatusEnum.WDWG.getKey() ,OrderBaseStatusEnum.DQD.getKey()
|
|
|
+ OrderBaseStatusEnum.WDWG.getKey() ,OrderBaseStatusEnum.DQD.getKey(),OrderBaseStatusEnum.YJS.getKey()
|
|
|
)
|
|
|
.ne(isYb != null && isYb,PgOrderBase::getPgIncreOrderId,"")
|
|
|
.ne(isWb != null && isWb,PgOrderBase::getRpProjectRepairId,"")
|