修改采购单和采购变更单数据导出方法

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

@@ -368,7 +368,7 @@ public class SaleOrderChangeController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.ALL, method = RequestMethod.GET)
 	public ModelAndView exportChanges(PageParams params, String searchFilter) {
-		PageInfo pageInfo = new PageInfo(params);
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter distribute = userService.distribute();
@@ -400,7 +400,7 @@ public class SaleOrderChangeController {
 	@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
 	public ModelAndView exportTodoChanges(PageParams params, String searchFilter) {
 		params.setPage(1);
-		PageInfo pageInfo = new PageInfo(params);
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.filter("status", Status.NOT_REPLY.value());
 		pageInfo.filter("unNeedReply", Constant.NO);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -432,7 +432,7 @@ public class SaleOrderChangeController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
 	public ModelAndView exportDoneChanges(PageParams params, String searchFilter) {
-		PageInfo pageInfo = new PageInfo(params);
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.filter("status", Status.REPLIED.value());
 		pageInfo.filter("unNeedReply", Constant.NO);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -466,7 +466,7 @@ public class SaleOrderChangeController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.UNREAD, method = RequestMethod.GET)
 	public ModelAndView exportUnreadChanges(PageParams params, String searchFilter) {
-		PageInfo pageInfo = new PageInfo(params);
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.filter("unNeedReply", Constant.YES);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.sorting("date", org.springframework.data.domain.Sort.Direction.DESC);

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

@@ -785,7 +785,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findAllDetailByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
 			: getPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_全部"));
 		logger.log("客户采购单", "导出Excel列表", "导出全部Excel列表");
@@ -816,7 +816,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待回复");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findTodoOrders(pageInfo, filter).getContent()
 				: getTodoPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表 _待回复"));
 		logger.log("客户采购单", "导出Excel列表", "导出待回复Excel列表");
@@ -847,7 +847,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已回复");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findDoneOrders(pageInfo, filter).getContent()
 				: getDonePurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已回复"));
 		logger.log("客户采购单", "导出Excel列表", "导出已回复Excel列表");
@@ -879,7 +879,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已结案");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findEndOrders(pageInfo, filter).getContent()
                 : getEndPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已结案"));
 		logger.log("客户采购单", "导出Excel列表", "导出已结案Excel列表");
@@ -910,7 +910,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待交货");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findWaitingOrders(pageInfo, filter).getContent()
 				: getWaitingPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_待交货"));
 		logger.log("客户采购单", "导出Excel列表", "导出待交货Excel列表");
@@ -925,7 +925,7 @@ public class SaleOrderController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.RECEIVED, method = RequestMethod.GET)
 	public ModelAndView exportReceivedOrders(PageParams params, String searchFilter) {
-		PageInfo pageInfo = new PageInfo(params);
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -937,13 +937,12 @@ public class SaleOrderController {
 			filter.setDistribute(distribute.getDistribute());
 		}
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		pageInfo.filter("end", Constant.YES);
 		pageInfo.sorting("date", Direction.DESC);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已收货");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findReceivedOrders(pageInfo, filter).getContent()
 				: getReceivedPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已收货"));
 		logger.log("客户采购单", "导出Excel列表", "导出已收货Excel列表");
@@ -1227,7 +1226,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待回复");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findTodoOrders(pageInfo, filter).getContent()
 				: getTodoPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表 _待回复"));
 		logger.log("采购单", "导出Excel列表", "导出待回复Excel列表");
@@ -1251,7 +1250,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已回复");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findDoneOrders(pageInfo, filter).getContent()
 				: getDonePurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已回复"));
 		logger.log("采购单", "导出Excel列表", "导出已回复Excel列表");
@@ -1269,13 +1268,14 @@ public class SaleOrderController {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("end", Constant.YES);
 		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", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findEndOrders(pageInfo, filter).getContent()
 				: getEndPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已结案"));
 		logger.log("采购单", "导出Excel列表", "导出已结案Excel列表");
@@ -1299,7 +1299,7 @@ public class SaleOrderController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待交货");
-		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findWaitingOrders(pageInfo, filter).getContent()
 				: getWaitingPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_待交货"));
 		logger.log("采购单", "导出Excel列表", "导出待交货Excel列表");