|
@@ -103,7 +103,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
|
|
|
wrapper.and(q -> q
|
|
|
.and(r -> r.eq("o", OrderInfo::getWlnStorageCode, "T007").ge("o", OrderInfo::getWlnStatus, 2))
|
|
|
- .or(r -> r.ne("o", OrderInfo::getWlnStorageCode, "T007")));
|
|
|
+ .or(r -> r.ne("o", OrderInfo::getWlnStorageCode, "T007").ge("o", OrderInfo::getWlnStatus, 1)));
|
|
|
|
|
|
if (Objects.equals(dto.getLinkedStatementOfAccount(), 0)) {
|
|
|
wrapper.isNull("o.statement_of_account_id");
|