认定单增加根据日期筛选以及根据筛选结果导出

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

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

@@ -163,12 +163,12 @@ public class SaleSampleController {
 	 */
 	@RequestMapping(value = "/approval", method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseProofingApproval> getProofingApprovals(PageParams params, String keyword) {
+	public Page<PurchaseProofingApproval> getProofingApprovals(PageParams params, String keyword,Long fromDate,Long endDate) {
 		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		logger.log("客户认定单", "查看所有客户认定单");
-		return purchaseProofingService.findApprovalsByPageInfo(info, keyword);
+		return purchaseProofingService.findApprovalsByPageInfo(info, keyword, fromDate, endDate);
 	}
 
 	/**
@@ -241,14 +241,14 @@ public class SaleSampleController {
 	 * @return
 	 */
 	@RequestMapping(value = "/approval/xls", method = RequestMethod.GET)
-	public ModelAndView exportApprovals(String keyword) {
+	public ModelAndView exportApprovals(String keyword, Long fromDate, Long endDate) {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("inDate", 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.findApprovalsByPageInfo(pageInfo, keyword).getContent());
+		modelAndView.addObject("data", purchaseProofingService.findApprovalsByPageInfo(pageInfo, keyword, fromDate, endDate).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleApproval", "客户认定单列表"));
 		logger.log("客户认定单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;