【商务平台】 应收对账单和应付对账单增加按时间过滤

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

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -60,9 +61,11 @@ public class SaleApBillController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseApBill> getReceivedPurchaseApBills(PageParams params, String keyword) {
+	public SPage<PurchaseApBill> getReceivedPurchaseApBills(PageParams params, String searchFilter) {
 		logger.log("客户应付发票", "获取全部客户应付发票");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pad_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.ErpProdIODetail;
 import com.uas.platform.b2b.model.PurchaseApCheck;
 import com.uas.platform.b2b.model.PurchaseApCheckItem;
@@ -207,9 +208,11 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String keyword) {
+	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "作为买家，获取全部应收对账单");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为买家
 		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -126,12 +126,12 @@
 					共 <span ng-bind="tableParams.total()" class="text-num"></span>
 				</div>
 			</div>
-<!-- 			<div class="col-xs-2 toggle">
+			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
 					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
 				</a>
-			</div> -->
+			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -141,12 +141,12 @@
 					共 <span ng-bind="tableParams.total()" class="text-num"></span>
 				</div>
 			</div>
-			<!-- <div class="col-xs-2 toggle">
+			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
 					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
 				</a>
-			</div> -->
+			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">