更新采购验收，发票，对账单导出数据的方法

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

@@ -127,12 +127,11 @@ public class SaleAcceptController {
 	public ModelAndView export(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("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseAcceptService.findAllByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getReceivedPurchaseAccepts(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleAccept", "客户验收单列表"));
 		logger.log("客户验收单", "导出Excel列表", "导出Excel列表");
 		return modelAndView;

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

@@ -133,30 +133,10 @@ public class SaleApBillController {
 		SearchFilter searchFilter = new SearchFilter();
 		searchFilter.setEndDate(endDate);
 		searchFilter.setFromDate(fromDate);
+		searchFilter.setKeyword(keyword);
 		PageParams params = new PageParams();
 		params.setCount(1000);
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params,
-				JSON.toJSONString(searchFilter));
-		// 当前登录企业作为供应商
-		pageParams.getFilters().put("pad_venduu", SystemSession.getUser().getEnterprise().getUu());
-		// TODO 其他过滤条件
-		SearchFilter filter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
-				list.add(object);
-			}
-			pageParams.getFilters().put("pad_enuu", new MultiValue(list, true));
-		}
-		// 排序条件
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pab_id", false, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		SPage<PurchaseApBill> apbills = searchService.searchPurchaseApBillIds(keyword, pageParams);
-		modelAndView.addObject("data", apbills.getContent());
+		modelAndView.addObject("data", getReceivedPurchaseApBills(params, JSONObject.toJSONString(searchFilter)).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApBill", "客户应付发票列表"));
 		logger.log("客户应付发票", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -431,14 +431,12 @@ public class SaleApCheckController {
 	public ModelAndView exportApCheck(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
+		PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data",
-				purchaseApCheckService.findAllByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
+		modelAndView.addObject("data", getPurchaseApChecks(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_全部"));
 		logger.log("应收对账单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -454,14 +452,12 @@ public class SaleApCheckController {
 	public ModelAndView exportApCheckDone(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
+        PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已确认");
-		modelAndView.addObject("data",
-				purchaseApCheckService.findDoneByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
+		modelAndView.addObject("data", getDoneApChecks(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_已确认"));
 		logger.log("应收对账单", "导出Excel列表", "导出已确认Excel列表");
 		return modelAndView;
@@ -477,14 +473,12 @@ public class SaleApCheckController {
 	public ModelAndView exportApCheckTodo(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
+        PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "未对账");
-		modelAndView.addObject("data",
-				purchaseApCheckService.findTodoByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
+		modelAndView.addObject("data", getTodoApChecks(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_未对账"));
 		logger.log("应收对账单", "导出Excel列表", "导出未对账Excel列表");
 		return modelAndView;
@@ -500,14 +494,12 @@ public class SaleApCheckController {
 	public ModelAndView exportApChecks(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
+        PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已做废");
-		modelAndView.addObject("data",
-				purchaseApCheckService.findEndByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
+		modelAndView.addObject("data", getEndApChecks(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_已做废"));
 		logger.log("应收对账单", "导出Excel列表", "导出已做废Excel列表");
 		return modelAndView;