|
|
@@ -33,7 +33,6 @@ import javax.persistence.criteria.CriteriaBuilder;
|
|
|
import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
@@ -81,7 +80,8 @@ public class OrderServiceImpl implements OrderService {
|
|
|
SimpleExpression status3 = PredicateUtils.eq("status", Status.TOBECONFIRMED.value(), true);
|
|
|
SimpleExpression status4 = PredicateUtils.eq("status", Status.UNAVAILABLE_NOPAID.value(), true);
|
|
|
SimpleExpression status5 = PredicateUtils.eq("status", Status.UNAVAILABLE_PERSONAL.value(), true);
|
|
|
- SimpleExpression[] expressions = new SimpleExpression[] { status1, status2, status3, status4, status5};
|
|
|
+ SimpleExpression status6 = PredicateUtils.eq("status", Status.TOBESHIPPED.value(), true);
|
|
|
+ SimpleExpression[] expressions = new SimpleExpression[] { status1, status2, status3, status4, status5, status6};
|
|
|
LogicalExpression purLogical = PredicateUtils.or(expressions);
|
|
|
|
|
|
// 采购单待上传的状态
|