导出Excel分类，关键词

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1135 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -74,14 +74,14 @@ public class SaleAcceptController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView export() {
+	public ModelAndView export(String keyword) {
 		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日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseAcceptService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseAcceptService.findAllByPageInfo(pageInfo, keyword).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

@@ -72,14 +72,14 @@ public class SaleApBillController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView export() {
+	public ModelAndView export(String keyword) {
 		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日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseApBillService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseApBillService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApBill", "客户应付发票列表"));
 		logger.log("客户应付发票", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -72,14 +72,14 @@ public class SaleBadInController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView export() {
+	public ModelAndView export(String keyword) {
 		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日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseBadInService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseBadInService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/qc/qcBadIn", "客户不良品入库单列表"));
 		logger.log("客户不良品入库单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -72,14 +72,14 @@ public class SaleBadOutController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView exportApprovals() {
+	public ModelAndView exportApprovals(String keyword) {
 		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日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseBadOutService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseBadOutService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/qc/qcBadOut", "客户不良品出库单列表"));
 		logger.log("客户不良品出库单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -72,14 +72,14 @@ public class SaleCustomerForecastController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView exportVendors() {
+	public ModelAndView exportVendors(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("order.date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseForecastOrderService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseForecastOrderService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleForecast", "客户采购预测单列表"));
 		logger.log("客户采购预测单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -162,23 +162,70 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 导出
+	 * 导出 - 全部
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView export() {
+	@RequestMapping(value = "/xls", params = RequestState.ALL, method = RequestMethod.GET)
+	public ModelAndView exportAll(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("inquiry.date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseInquiryService.findAllByPageInfo(pageInfo, null).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleInquiry", "客户询价单列表"));
+		modelAndView.addObject("state", "全部");
+		modelAndView.addObject("data", purchaseInquiryService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleInquiry", "客户询价单列表_全部"));
 		logger.log("客户询价单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
 	}
 
+	/**
+	 * 导出 - 待报价
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
+	public ModelAndView exportTodo(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("inquiry.date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// 询价单状态为未回复
+		pageInfo.filter("status", Status.NOT_REPLY.value());
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "待报价");
+		modelAndView.addObject("data", purchaseInquiryService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleInquiry", "客户询价单列表_待报价"));
+		logger.log("客户询价单", "导出Excel列表", "导出待报价Excel列表");
+		return modelAndView;
+	}
+
+	/**
+	 * 导出 - 已报价
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
+	public ModelAndView exportDone(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("inquiry.date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// 询价单状态为已回复
+		pageInfo.filter("status", Status.REPLIED.value());
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "已报价");
+		modelAndView.addObject("data", purchaseInquiryService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleInquiry", "客户询价单列表_已报价"));
+		logger.log("客户询价单", "导出Excel列表", "导出已报价Excel列表");
+		return modelAndView;
+	}
+
 }

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

@@ -72,14 +72,14 @@ public class SaleMRBController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView export() {
+	public ModelAndView export(String keyword) {
 		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日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseMRBService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseMRBService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/qc/qcMRB", "客户MRB单列表"));
 		logger.log("客户MRB单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -365,12 +365,12 @@ public class SaleNoticeController {
 	}
 
 	/**
-	 * 导出发货单Excel
+	 * 导出发货单Excel - 全部
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/sends/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/sends/xls", params = RequestState.ALL, method = RequestMethod.GET)
 	public ModelAndView exportSends(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
@@ -378,10 +378,55 @@ public class SaleNoticeController {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "全部");
 		modelAndView.addObject("data", purchaseNoticeService.findSendsByPageInfo(pageInfo, keyword).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleSend", "发货单列表"));
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleSend", "发货单列表_全部"));
 		logger.log("发货单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
 	}
 
+	/**
+	 * 导出发货单Excel - 未收料
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/sends/xls", params = RequestState.TODO, method = RequestMethod.GET)
+	public ModelAndView exportTodoSends(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("verifystatus", Constant.NO);
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "未收料");
+		modelAndView.addObject("data", purchaseNoticeService.findSendsByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleSend", "发货单列表_未收料"));
+		logger.log("发货单", "导出Excel列表", "导出未收料Excel列表");
+		return modelAndView;
+	}
+
+	/**
+	 * 导出发货单Excel - 已收料
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/sends/xls", params = RequestState.DONE, method = RequestMethod.GET)
+	public ModelAndView exportDoneSends(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("verifystatus", Constant.YES);
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "已收料");
+		modelAndView.addObject("data", purchaseNoticeService.findSendsByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleSend", "发货单列表_已收料"));
+		logger.log("发货单", "导出Excel列表", "导出已收料Excel列表");
+		return modelAndView;
+	}
+
 }

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

@@ -122,23 +122,70 @@ public class SaleOrderChangeController {
 	}
 
 	/**
-	 * 导出
+	 * 导出 - 全部
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView exportVendors() {
+	@RequestMapping(value = "/xls", params = RequestState.ALL, method = RequestMethod.GET)
+	public ModelAndView exportChanges(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("order.vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseOrderChangeService.findAllByPageInfo(pageInfo, null).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表"));
+		modelAndView.addObject("state", "全部");
+		modelAndView.addObject("data", purchaseOrderChangeService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表_全部"));
 		logger.log("客户采购变更单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
 	}
 
+	/**
+	 * 导出 - 待处理
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
+	public ModelAndView exportTodoChanges(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("order.vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// 变更单状态为未回复
+		pageInfo.filter("status", Status.NOT_REPLY.value());
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "待确认");
+		modelAndView.addObject("data", purchaseOrderChangeService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表_待确认"));
+		logger.log("客户采购变更单", "导出Excel列表", "导出待确认Excel列表");
+		return modelAndView;
+	}
+
+	/**
+	 * 导出 - 已处理
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
+	public ModelAndView exportDoneChanges(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("order.vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// 变更单状态为已回复
+		pageInfo.filter("status", Status.REPLIED.value());
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "已处理");
+		modelAndView.addObject("data", purchaseOrderChangeService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表_已处理"));
+		logger.log("客户采购变更单", "导出Excel列表", "导出已处理Excel列表");
+		return modelAndView;
+	}
+
 }

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

@@ -72,14 +72,14 @@ public class SaleReturnController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView exportApprovals() {
+	public ModelAndView exportApprovals(String keyword) {
 		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日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseReturnService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseReturnService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleReturn", "客户验退单列表"));
 		logger.log("客户验退单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -172,27 +172,70 @@ public class SaleSampleController {
 	}
 
 	/**
-	 * 导出
+	 * 导出打样申请 - 全部
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView exportProofings() {
+	@RequestMapping(value = "/xls", params = RequestState.ALL, method = RequestMethod.GET)
+	public ModelAndView exportProofings(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("proofing.date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", purchaseProofingService.findAllByPageInfo(pageInfo, null).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleProofing", "客户打样申请单列表"));
+		modelAndView.addObject("state", "全部");
+		modelAndView.addObject("data", purchaseProofingService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleProofing", "客户打样申请单列表_全部"));
 		logger.log("客户打样申请单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
 	}
 
 	/**
-	 * 导出
+	 * 导出打样申请 - 待送样
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
+	public ModelAndView exportTodoProofings(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("proofing.date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "待送样");
+		modelAndView.addObject("data", purchaseProofingService.findTodoByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleProofing", "客户打样申请单列表_待送样"));
+		logger.log("客户打样申请单", "导出Excel列表", "导出待送样Excel列表");
+		return modelAndView;
+	}
+
+	/**
+	 * 导出打样申请 - 已送样
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
+	public ModelAndView exportDoneProofings(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("proofing.date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("state", "已送样");
+		modelAndView.addObject("data", purchaseProofingService.findDoneByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleProofing", "客户打样申请单列表_已送样"));
+		logger.log("客户打样申请单", "导出Excel列表", "导出已送样Excel列表");
+		return modelAndView;
+	}
+
+	/**
+	 * 导出认定单 - 全部
 	 * 
 	 * @param params
 	 * @return