修改导出Excel的实现方法为获取数据的实现

src/main/java/com/uas/platform/b2b/controller/MakeOutOrderController.java

@@ -124,14 +124,28 @@ public class MakeOutOrderController {
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
 	public ModelAndView exportOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("date", Direction.DESC);
-		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		String keyword = filter.getKeyword();
+
+		PageParams pageParams = new PageParams();
+		pageParams.setPage(1);
+		pageParams.setCount(JxlsExcelView.MAX_SIZE);
+
+		com.uas.search.b2b.model.PageParams searchPageParams = searchService.convertPageParams(pageParams, searchFilter);
+		// 当前登录企业作为供应商
+		searchPageParams.getFilters().put("ma_enuu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+		// TODO 供应商分配，已去除
+		// 排序条件
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		searchPageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		List<MakeOrder> makeOrders =  searchService.searchMakeOrderIds(keyword, searchPageParams).getContent();
+
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data", makeOrderService.findByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", makeOrders);
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOutOrder", "委外加工单列表_全部"));
 		logger.log("自己委外加工单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;