更新销售单采购订单导出数据的方法

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

@@ -419,7 +419,7 @@ public class SaleOrderController {
 		return searchService.searchPurchaseWaitingOrderIds(keyword, pageParams);
 	}
 
-//    /**
+    //    /**
 //     * @param params
 //     * @param searchFilter
 //     * @author yujia 获取待发货的订单 - 搜索
@@ -771,13 +771,12 @@ public class SaleOrderController {
 	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("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("state", "全部");
-		modelAndView.addObject("data", purchaseOrderService.findAllDetailByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_全部"));
 		logger.log("客户采购单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -793,13 +792,12 @@ public class SaleOrderController {
 	public ModelAndView exportTodoOrders(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("state", "待回复");
-		modelAndView.addObject("data", purchaseOrderService.findTodoByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getTodoPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表 _待回复"));
 		logger.log("客户采购单", "导出Excel列表", "导出待回复Excel列表");
 		return modelAndView;
@@ -815,13 +813,12 @@ public class SaleOrderController {
 	public ModelAndView exportDoneOrders(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());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已回复");
-		modelAndView.addObject("data", purchaseOrderService.findDoneByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getDonePurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已回复"));
 		logger.log("客户采购单", "导出Excel列表", "导出已回复Excel列表");
 		return modelAndView;
@@ -837,13 +834,12 @@ public class SaleOrderController {
 	public ModelAndView exportEndOrders(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());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已结案");
-		modelAndView.addObject("data", purchaseOrderService.findEndByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getEndPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已结案"));
 		logger.log("客户采购单", "导出Excel列表", "导出已结案Excel列表");
 		return modelAndView;
@@ -859,13 +855,12 @@ public class SaleOrderController {
 	public ModelAndView exportWaitingOrders(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());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待交货");
-		modelAndView.addObject("data", purchaseOrderService.findWaitingByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getWaitingPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_待交货"));
 		logger.log("客户采购单", "导出Excel列表", "导出待交货Excel列表");
 		return modelAndView;
@@ -1137,14 +1132,12 @@ public class SaleOrderController {
 	public ModelAndView exportPurcOrders(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());
+        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",
-				purchaseOrderService.findAllOrdersDetailByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getAllPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_全部"));
 		logger.log("采购单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -1160,13 +1153,12 @@ public class SaleOrderController {
 	public ModelAndView exportPurcTodoOrders(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());
+		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", purchaseOrderService.findTodoOrdersByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getTodoPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表 _待回复"));
 		logger.log("采购单", "导出Excel列表", "导出待回复Excel列表");
 		return modelAndView;
@@ -1182,13 +1174,12 @@ public class SaleOrderController {
 	public ModelAndView exportPurcDoneOrders(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());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已回复");
-		modelAndView.addObject("data", purchaseOrderService.findDoneOrdersByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getDonePurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已回复"));
 		logger.log("采购单", "导出Excel列表", "导出已回复Excel列表");
 		return modelAndView;
@@ -1204,13 +1195,12 @@ public class SaleOrderController {
 	public ModelAndView exportPurcEndOrders(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());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已结案");
-		modelAndView.addObject("data", purchaseOrderService.findEndOrdersByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getEndPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已结案"));
 		logger.log("采购单", "导出Excel列表", "导出已结案Excel列表");
 		return modelAndView;
@@ -1226,40 +1216,17 @@ public class SaleOrderController {
 	public ModelAndView exportPurcWaitingOrders(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());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待交货");
-		modelAndView.addObject("data", purchaseOrderService.findWaitingOrdersByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getWaitingPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_待交货"));
 		logger.log("采购单", "导出Excel列表", "导出待交货Excel列表");
 		return modelAndView;
 	}
 
-//
-//	/**
-//	 * 导出 - 已收货
-//	 *
-//	 * @param params
-//	 * @return
-//	 */
-//	@RequestMapping(value = "/purc/xls", params = RequestState.RECEIVED, method = RequestMethod.GET)
-//	public ModelAndView exportPurcReceivedOrders(PageParams params, String searchFilter) {
-//		params.setPage(1);
-//		params.setCount(SearchConstants.TOP_NUM);
-//		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-//		ModelAndView modelAndView = new ModelAndView();
-//		modelAndView.addObject("dateFormat", dateFormat);
-//		modelAndView.addObject("state", "待交货");
-//		modelAndView.addObject("data", getReceivedPurchaseOrderItems(params, searchFilter).getContent());
-//		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_待交货"));
-//		logger.log("采购单", "导出Excel列表", "导出待交货Excel列表");
-//		return modelAndView;
-//	}
-
-
 	/**
 	 * 设置单据已读
 	 * @author wangmh