按关键词查询出的结果导出Excel

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

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

@@ -217,7 +217,7 @@ public class SaleNoticeController {
 	 * @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("date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -225,7 +225,7 @@ public class SaleNoticeController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("type", "全部");
-		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleNotice", "客户发货提醒列表_全部"));
 		logger.log("客户送货提醒", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -239,7 +239,7 @@ public class SaleNoticeController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
-	public ModelAndView exportUndoVendors() {
+	public ModelAndView exportUndoVendors(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -249,9 +249,9 @@ public class SaleNoticeController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("type", "待发货");
-		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleNotice", "客户发货提醒列表_待发货"));
-		logger.log("客户送货提醒", "导出Excel列表", "导出全部Excel列表");
+		logger.log("客户送货提醒", "导出Excel列表", "导出待发货Excel列表");
 		return modelAndView;
 	}
 
@@ -262,7 +262,7 @@ public class SaleNoticeController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
-	public ModelAndView exportDoneVendors() {
+	public ModelAndView exportDoneVendors(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -272,9 +272,9 @@ public class SaleNoticeController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("type", "已发货");
-		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleNotice", "客户发货提醒列表_已发货"));
-		logger.log("客户送货提醒", "导出Excel列表", "导出全部Excel列表");
+		logger.log("客户送货提醒", "导出Excel列表", "导出已发货Excel列表");
 		return modelAndView;
 	}
 
@@ -285,7 +285,7 @@ public class SaleNoticeController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.END, method = RequestMethod.GET)
-	public ModelAndView exporEndtVendors() {
+	public ModelAndView exporEndtVendors(String keyword) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -295,14 +295,37 @@ public class SaleNoticeController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("type", "已结案");
-		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, null).getContent());
+		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleNotice", "客户发货提醒列表_已结案"));
-		logger.log("客户送货提醒", "导出Excel列表", "导出全部Excel列表");
+		logger.log("客户送货提醒", "导出Excel列表", "导出已结案Excel列表");
+		return modelAndView;
+	}
+
+	/**
+	 * 导出送货提醒（备料中）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/xls", params = "_state=waiting", method = RequestMethod.GET)
+	public ModelAndView exportWaitingVendors(String keyword) {
+		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		// 需要等待发货
+		pageInfo.filter("waiting", Constant.YES);
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("type", "备料中");
+		modelAndView.addObject("data", purchaseNoticeService.findAllByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleNotice", "客户发货提醒列表_备料中"));
+		logger.log("客户送货提醒", "导出Excel列表", "导出备料中Excel列表");
 		return modelAndView;
 	}
 
 	/**
-	 * 导出
+	 * 导出发货单Excel
 	 * 
 	 * @param params
 	 * @return

src/main/webapp/resources/js/index/app.js

@@ -1237,6 +1237,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					if(page) {
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
+						$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
 					}
 				}, function(response){
 					$scope.loading = false;

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -286,7 +286,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/notice/xls?_state={{active}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/notice/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
 		</tr>
 		<tr class="sep-row">