Commit d2ae2d23 authored by 张永's avatar 张永

1

parent 229dde85
...@@ -988,12 +988,12 @@ public class OrderServiceImpl implements OrderService { ...@@ -988,12 +988,12 @@ public class OrderServiceImpl implements OrderService {
} }
}); });
Integer start = page.getFirstRowNumber().intValue() - 1; /*Integer start = page.getFirstRowNumber().intValue() - 1;
Integer end = page.getLastRowNumber().intValue(); Integer end = page.getLastRowNumber().intValue();
Integer size = sortList.size(); Integer size = sortList.size();
end = size < end ? size : end; end = size < end ? size : end;
page.setTotal((long)sortList.size()); page.setTotal((long)sortList.size());
List<Map<String, Object>> datas = sortList.subList(start, end); List<Map<String, Object>> datas = sortList.subList(start, end);*/
if(orderList != null && orderList.size() >0 ) { if(orderList != null && orderList.size() >0 ) {
List<String> orderIdList = orderList.stream().map(o -> (String)o.get("SubOrderID")).collect(Collectors.toList()); List<String> orderIdList = orderList.stream().map(o -> (String)o.get("SubOrderID")).collect(Collectors.toList());
...@@ -1034,7 +1034,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -1034,7 +1034,7 @@ public class OrderServiceImpl implements OrderService {
} }
Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> result = new HashMap<String, Object>();
result.put("page", page); result.put("page", page);
result.put("SalesOrderList", datas); result.put("SalesOrderList", orderList);
return new RespObject(result); return new RespObject(result);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment