1

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -254,6 +254,11 @@ public class OrderController {
             }else if(criteria.getStatus()==3){
                 //进行中
                 query.addCriteria(Criteria.where("status").nin(LITEORDER_STATUS.CLOSED,LITEORDER_STATUS.NEW));
+            }else if(criteria.getStatus()==4){
+                query.addCriteria(Criteria.where("status").is(LITEORDER_STATUS.NEW));
+            }else if(criteria.getStatus()==5){
+                query.addCriteria(Criteria.where("status").is(LITEORDER_STATUS.CLOSED)
+                        .and("appendData.shortage").is("true"));
             }
         }
         PageData<LiteOrder> orderList = liteOrderManager.findByPage(query, pageable);

src/main/java/com/neotel/smfcore/core/order/rest/bean/query/OrderQueryCondition.java

@@ -27,7 +27,7 @@ public class OrderQueryCondition {
     @QueryCondition(type = QueryCondition.Type.NIN, propName = "source")
     private List<String> excludeSourceList;
 
-    //状态，0=所有，1=已关闭，2=未关闭，3=进行中
+    //状态，0=所有，1=已关闭，2=未关闭，3=进行中，4=等待中
     private Integer status;