|
|
@@ -312,7 +312,7 @@ public class DeputyOrderController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 买家查看代采订单(已下载,审核同意)
|
|
|
+ * 买家查看代采订单(已下载,审核不同意)
|
|
|
*
|
|
|
* @param params
|
|
|
* @return
|
|
|
@@ -335,6 +335,7 @@ public class DeputyOrderController {
|
|
|
pageParams.getFilters().put("deo_enuu", new MultiValue(list, true));
|
|
|
}
|
|
|
pageParams.getFilters().put("deo_statuscode", Status.NOTAGREED.value());
|
|
|
+ pageParams.getFilters().put("deo_entrystatus", "保存");
|
|
|
// 排序条件
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
|
sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
|
|
|
@@ -617,7 +618,7 @@ public class DeputyOrderController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 买家查看代采订单(已下载,审核同意)
|
|
|
+ * 买家查看代采订单(已下载,审核不同意)
|
|
|
*
|
|
|
* @param params
|
|
|
* @return
|
|
|
@@ -628,6 +629,7 @@ public class DeputyOrderController {
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
pageInfo.filter("statuscode", Status.NOTAGREED.value());
|
|
|
+ pageInfo.filter("entrystatus", "保存");
|
|
|
return deputyOrderService.getOrders(pageInfo, filter);
|
|
|
}
|
|
|
|