|
|
@@ -533,12 +533,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
}
|
|
|
|
|
|
- if (filter.getFromDate() != null)
|
|
|
+ if (filter.getFromDate() != null) {
|
|
|
pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
- if (filter.getEndDate() != null)
|
|
|
+ }
|
|
|
+ if (filter.getEndDate() != null) {
|
|
|
pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
- if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
+ }
|
|
|
+ if (!CollectionUtils.isEmpty(filter.getDistribute())) {
|
|
|
pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
|
|
|
+ }
|
|
|
+ pageInfo.expression(PredicateUtils.eq("status", Status.NOT_REPLY.value(), false));
|
|
|
}
|
|
|
Page<PurchaseOrderTodo> pageOrders = purchaseOrderTodoDao.findAll(new Specification<PurchaseOrderTodo>() {
|
|
|
@Override
|