委外加工和财务对账单据

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

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

@@ -4,7 +4,6 @@ package com.uas.platform.b2b.controller;
 import java.text.SimpleDateFormat;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -13,17 +12,18 @@ 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.MakeAccept;
 import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeAcceptService;
-import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.model.SPage;
 /**
  * 卖家获取对应的客户委外验收单
  * @author aof
@@ -38,7 +38,8 @@ public class MakeAcceptController {
 	private MakeAcceptService makeAcceptService;
 	
 	@Autowired
-	private UserService userService;
+	private SearchService searchService;
+
 	/**
 	 * 作为卖家，客户的委外验收单（全部）
 	 * 
@@ -47,22 +48,16 @@ public class MakeAcceptController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeAccept> getAllMakeAccepts(PageParams params, String searchFilter) {
+	public SPage<MakeAccept> getAllMakeAccepts(PageParams params, String searchFilter) {
 		logger.log("客户委外验收单", "查看收到的客户委外验收单列表（全部 ）");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		} 
-		return makeAcceptService.findAllByPageInfo(info, filter);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
+		return searchService.searchMakeAcceptIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -4,7 +4,6 @@ package com.uas.platform.b2b.controller;
 import java.text.SimpleDateFormat;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,10 +15,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeOrderChangeService;
-import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -27,6 +28,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.model.SPage;
 
 /**
  * 委外加工变更处理
@@ -41,7 +43,7 @@ public class MakeOrderChangeController {
 	private MakeOrderChangeService makeOrderChangeService;
 	
 	@Autowired
-	private UserService userService;
+	private SearchService searchService;
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
@@ -53,22 +55,17 @@ public class MakeOrderChangeController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeOrderChangeItem> getReceivedPurchaseOrderChanges(PageParams params, String searchFilter) {
+	public SPage<MakeOrderChangeItem> getReceivedPurchaseOrderChanges(PageParams params, String searchFilter) {
 		logger.log("客户委外变更单", "查看收到的客户委外变更单列表（全部）");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		} 
-		return makeOrderChangeService.findByPageInfo(info, filter);
+		System.out.println(JSON.toJSON(searchFilter));
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("mcd_pcid", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+		System.out.println(JSON.toJSON(pageParams));
+		return searchService.searchMakeOrderChangeIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -4,7 +4,6 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,22 +15,23 @@ 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.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderDone;
-import com.uas.platform.b2b.model.MakeOrderEnd;
 import com.uas.platform.b2b.model.MakeOrderReply;
-import com.uas.platform.b2b.model.MakeOrderTodo;
 import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeOrderService;
-import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+import com.uas.search.b2b.model.SPage;
 
 /**
  * 卖家对委外加工单的操作
@@ -47,7 +47,8 @@ public class MakeOrderController {
 	private MakeOrderService makeOrderService;
 	
 	@Autowired
-	private UserService userService;
+	private SearchService searchService;
+
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
@@ -59,22 +60,16 @@ public class MakeOrderController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeOrder> getAllMakeOrders(PageParams params, String searchFilter) {
+	public SPage<MakeOrder> getAllMakeOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括委外明细）（全部）");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		} 
-		return makeOrderService.findByPageInfo(info, filter);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
+		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
 
 	/**
@@ -85,22 +80,16 @@ public class MakeOrderController {
 	 */
 	@RequestMapping(value = "/status", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeOrderDone> getDoneMakeOrders(PageParams params, String searchFilter) {
+	public SPage<MakeOrder> getDoneMakeOrders(PageParams params, String searchFilter) {
 		logger.log("委外加工单", "查看收到的委外加工单列表（已回复）");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		} 
-		return makeOrderService.findDoneByPageInfo(info, filter);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+		pageParams.getFilters().put("ma_status", Status.REPLIED.value());
+		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
 
 	/**
@@ -111,22 +100,16 @@ public class MakeOrderController {
 	 */
 	@RequestMapping(value = "/status", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeOrderTodo> getToDoMakeOrders(PageParams params, String searchFilter) {
-		logger.log("委外加工单", "查看收到的委外加工单列表（已回复）");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		} 
-		return makeOrderService.findTodoByPageInfo(info, filter);
+	public SPage<MakeOrder> getToDoMakeOrders(PageParams params, String searchFilter) {
+		logger.log("委外加工单", "查看收到的委外加工单列表（未回复）");
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+		pageParams.getFilters().put("ma_status", Status.NOT_REPLY.value());
+		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
 
 	/**
@@ -137,22 +120,16 @@ public class MakeOrderController {
 	 */
 	@RequestMapping(value = "/status", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeOrderEnd> getEndMakeOrders(PageParams params, String searchFilter) {
-		logger.log("委外加工单", "查看收到的委外加工单列表（已回复）");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		} 
-		return makeOrderService.findEndByPageInfo(info, filter);
+	public SPage<MakeOrder> getEndMakeOrders(PageParams params, String searchFilter) {
+		logger.log("委外加工单", "查看收到的委外加工单列表（已结案）");
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+		pageParams.getFilters().put("ma_end", Constant.YES);
+		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.controller;
 import java.text.SimpleDateFormat;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -12,10 +11,11 @@ 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.MakeOrder;
 import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeOrderService;
-import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -23,6 +23,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.model.SPage;
 
 /**
  * 查看自己委外加工的订单
@@ -37,9 +38,8 @@ public class MakeOutOrderController {
 	@Autowired
 	private MakeOrderService makeOrderService;
 
-	@SuppressWarnings("deprecation")
 	@Autowired
-	private UserService userService;
+	private SearchService searchService;
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
@@ -52,25 +52,16 @@ public class MakeOutOrderController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeOrder> getAllMakeOutOrders(PageParams params, String searchFilter) {
+	public SPage<MakeOrder> getAllMakeOutOrders(PageParams params, String searchFilter) {
 		logger.log("委外加工单", "查看委托客户加工的单据列表（全部）");
-		// 自己作为客户
-		PageInfo pageInfo = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		// 判断当前用户是否被客户分配
-		@SuppressWarnings("deprecation")
-		SearchFilter filter2 = userService.distribute();
-		if (filter2 != null) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		}
-		return makeOrderService.findByPageInfo(pageInfo, filter);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("ma_enuu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
 
+		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.controller;
 import java.text.SimpleDateFormat;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -12,17 +11,18 @@ 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.MakeReturn;
 import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeReturnService;
-import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.model.SPage;
 
 /**
  * 卖家获取对应的客户委外验退单
@@ -40,7 +40,7 @@ public class MakeReturnController {
 	private MakeReturnService makeReturnService;
 	
 	@Autowired
-	private UserService userService;
+	private SearchService searchService;
 
 	/**
 	 * 作为卖家，客户的委外验收单（全部）
@@ -52,22 +52,16 @@ public class MakeReturnController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<MakeReturn> getReceivedMakeReturns(PageParams params, String searchFilter) {
+	public SPage<MakeReturn> getReceivedMakeReturns(PageParams params, String searchFilter) {
 		logger.log("委外验退单", "获取全部委外验退单");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		//判断当前用户是否被客户分配
-		SearchFilter filter2 = userService.distribute();
-		if(filter2 != null ) {
-			if (filter2.getDistribute() == null) {
-				return null;
-			} else {
-				filter.setDistribute(filter2.getDistribute());
-			}
-		} 
-		return makeReturnService.findAllByPageInfo(info, filter);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("mr_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
+		return searchService.searchMakeReturnIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.controller;
 import java.text.SimpleDateFormat;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -13,15 +12,15 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseApBill;
-import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseApBillService;
-import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.search.b2b.model.SPage;
 
 /**
  * 卖家获取对应的客户应付票据
@@ -37,7 +36,7 @@ public class SaleApBillController {
 	private PurchaseApBillService purchaseApBillService;
 	
 	@Autowired
-	private UserService userService;
+	private SearchService searchService;
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
@@ -49,17 +48,14 @@ public class SaleApBillController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseApBill> getReceivedPurchaseApBills(PageParams params, String keyword, Long fromDate, Long endDate) {
+	public SPage<PurchaseApBill> getReceivedPurchaseApBills(PageParams params, String keyword) {
 		logger.log("客户应付发票", "获取全部客户应付发票");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		//判断当前用户是否被客户分配
-		SearchFilter filter = userService.distribute();
-		if(filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		return purchaseApBillService.findAllByPageInfo(info, keyword, fromDate, endDate, filter);
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("pad_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
+		return searchService.searchPurchaseApBillIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -6,14 +6,12 @@ import java.util.HashMap;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,14 +19,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.uas.platform.b2b.model.ErpProdIODetail;
 import com.uas.platform.b2b.model.PurchaseApCheck;
 import com.uas.platform.b2b.model.PurchaseApCheckDone;
 import com.uas.platform.b2b.model.PurchaseApCheckEnd;
 import com.uas.platform.b2b.model.PurchaseApCheckItem;
-import com.uas.platform.b2b.model.PurchaseApCheckTodo;
+import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ErpProdIODetailService;
 import com.uas.platform.b2b.service.PurchaseApCheckService;
 import com.uas.platform.b2b.service.UserService;
@@ -41,7 +39,15 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+import com.uas.search.b2b.model.SPage;
 
+/**
+ * 
+ * 应收对账单
+ *
+ */
+
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/apCheck")
 public class SaleApCheckController {
@@ -55,6 +61,9 @@ public class SaleApCheckController {
 	@Autowired
 	private UserService userService;
 
+	@Autowired
+	private SearchService searchService;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -85,28 +94,21 @@ public class SaleApCheckController {
 	}
 
 	/**
-	 * 作为卖家，获取应收对账单（全部）
+	 * 作为卖家，获取应付对账单（全部）
 	 * 
 	 * @param json
 	 * @return
 	 */
 	@RequestMapping(value = "/getAll", method = RequestMethod.GET)
 	@ResponseBody
-	public List<ErpProdIODetail> getAllApChecks() {
-		List<Long> distributes = null;
-		// 判断当前用户是否被客户分配
-		if (!SystemSession.getUser().isSys()) {
-			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
-			distributes = new ArrayList<Long>();
-			if (!CollectionUtils.isEmpty(vendors)) {
-				for (Vendor v : vendors) {
-					distributes.add(v.getMyEnUU());
-				}
-			} else {
-				return null;
-			}
-		}
-		return erpProdIODetailService.findAllApChecks(distributes);
+	public SPage<SaleARCheck> getAllApChecks(PageParams params, String keyword) {
+		logger.log("应付对账单", "作为卖家获取全部应付对账单");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("sac_venduu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
+		return searchService.searchSaleARCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -196,16 +198,14 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseApCheck> getPurchaseApChecks(PageParams params, String keyword, String searchFilter) {
-		logger.log("应收对账单", "获取全部应收对账单");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为买方ID传入
-		info.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = null;
-		if (StringUtils.hasText(searchFilter)) {
-			filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		}
-		return purchaseApCheckService.findAllByPageInfo(info, keyword, filter);
+	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String keyword) {
+		logger.log("应收对账单", "作为买家，获取全部应收对账单");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为买家
+		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
+		return searchService.searchPurchaseApCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -213,16 +213,14 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseApCheckTodo> getTodoApChecks(PageParams params, String keyword, String searchFilter) {
+	public SPage<PurchaseApCheck> getTodoApChecks(PageParams params, String keyword) {
 		logger.log("应收对账单", "获取未对账应收对账单");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为买方ID传入
-		info.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = null;
-		if (StringUtils.hasText(searchFilter)) {
-			filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		}
-		return purchaseApCheckService.findTodoByPageInfo(info, keyword, filter);
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为买家
+		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+		pageParams.getFilters().put("pa_checkstatus", String.valueOf("未对账"));
+		return searchService.searchPurchaseApCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -230,16 +228,14 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseApCheckDone> getDoneApChecks(PageParams params, String keyword, String searchFilter) {
+	public SPage<PurchaseApCheckDone> getDoneApChecks(PageParams params, String keyword) {
 		logger.log("应收对账单", "获取已确认应收对账单");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为买方ID传入
-		info.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = null;
-		if (StringUtils.hasText(searchFilter)) {
-			filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		}
-		return purchaseApCheckService.findDoneByPageInfo(info, keyword, filter);
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为买家
+		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+		// pageParams.getFilters().put("pa_checkstatus", "已确认");
+		return searchService.searchPurchaseApCheckDoneIds(keyword, pageParams);
 	}
 
 	/**
@@ -247,16 +243,14 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseApCheckEnd> getEndApChecks(PageParams params, String keyword, String searchFilter) {
+	public SPage<PurchaseApCheckEnd> getEndApChecks(PageParams params, String keyword) {
 		logger.log("应收对账单", "获取不同意，已作废应收对账单");
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为买方ID传入
-		info.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SearchFilter filter = null;
-		if (StringUtils.hasText(searchFilter)) {
-			filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		}
-		return purchaseApCheckService.findEndByPageInfo(info, keyword, filter);
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为买家
+		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
+		// TODO 其他过滤条件
+
+		return searchService.searchPurchaseApCheckEndIds(keyword, pageParams);
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/search/SearchController.java

@@ -7,10 +7,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseApBill;
+import com.uas.platform.b2b.model.PurchaseApCheck;
 import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
@@ -169,7 +170,7 @@ public class SearchController {
 	 */
 	@RequestMapping("/makeOrderChange")
 	@ResponseBody
-	public SPage<MakeOrderChange> searchMakeOrderChangeIds(String keyword, PageParams pageParams) {
+	public SPage<MakeOrderChangeItem> searchMakeOrderChangeIds(String keyword, PageParams pageParams) {
 		return searchService.searchMakeOrderChangeIds(keyword, pageParams);
 	}
 
@@ -237,11 +238,11 @@ public class SearchController {
 	}
 
 	/**
-	 * 应付对账单： sale$apcheck
+	 * 应付对账单： purc$apcheck
 	 */
 	@RequestMapping("/purcAPCheck")
 	@ResponseBody
-	public SPage<SaleARCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams) {
-		return searchService.searchSaleARCheckIds(keyword, pageParams);
+	public SPage<PurchaseApCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseApCheckIds(keyword, pageParams);
 	}
 }

src/main/java/com/uas/platform/b2b/search/SearchService.java

@@ -2,12 +2,14 @@ package com.uas.platform.b2b.search;
 
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.PurchaseApCheck;
+import com.uas.platform.b2b.model.PurchaseApCheckDone;
 import com.uas.platform.b2b.model.PurchaseApCheckEnd;
+import com.uas.platform.b2b.model.PurchaseApCheckTodo;
 import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
@@ -186,7 +188,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<MakeOrderChange> searchMakeOrderChangeIds(String keyword, PageParams pageParams);
+	public SPage<MakeOrderChangeItem> searchMakeOrderChangeIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 15.委外验退单
@@ -231,6 +233,7 @@ public interface SearchService {
 	public SPage<SaleARCheck> searchSaleARCheckIds(String keyword, PageParams pageParams);
 
 	/**
+
 	 * 应收对帐单
 	 * 
 	 * @param keyword
@@ -239,6 +242,24 @@ public interface SearchService {
 	 */
 	public SPage<PurchaseApCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams);
 
+	/**
+	 * 应收对账单（未对账）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseApCheckTodo> searchPurchaseApCheckTodoIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 应收对账单（已确认）
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
+	public SPage<PurchaseApCheckDone> searchPurchaseApCheckDoneIds(String keyword, PageParams pageParams);
+
 	/**
 	 * 应收对帐单（已作废）
 	 * 
@@ -246,7 +267,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<PurchaseApCheckEnd> searchPurchaseApcheckEndIds(String keyword, PageParams pageParams);
+	public SPage<PurchaseApCheckEnd> searchPurchaseApCheckEndIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 将com.uas.platform.core.model.PageParams转为搜索项目下的PageParams
@@ -259,4 +280,7 @@ public interface SearchService {
 	public com.uas.search.b2b.model.PageParams convertPageParams(com.uas.platform.core.model.PageParams params,
 			String searchFilter);
 
+
+
+
 }

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -10,13 +10,15 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.MakeAcceptDao;
-import com.uas.platform.b2b.dao.MakeOrderChangeDao;
+import com.uas.platform.b2b.dao.MakeOrderChangeItemDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
 import com.uas.platform.b2b.dao.MakeReturnDao;
 import com.uas.platform.b2b.dao.PurchaseAcceptDao;
 import com.uas.platform.b2b.dao.PurchaseApBillDao;
 import com.uas.platform.b2b.dao.PurchaseApCheckDao;
+import com.uas.platform.b2b.dao.PurchaseApCheckDoneDao;
 import com.uas.platform.b2b.dao.PurchaseApCheckEndDao;
+import com.uas.platform.b2b.dao.PurchaseApCheckTodoDao;
 import com.uas.platform.b2b.dao.PurchaseBadInDao;
 import com.uas.platform.b2b.dao.PurchaseBadOutDao;
 import com.uas.platform.b2b.dao.PurchaseForecastAllItemDao;
@@ -31,7 +33,6 @@ import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
 import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
 import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
 import com.uas.platform.b2b.dao.PurchaseProofingDao;
-import com.uas.platform.b2b.dao.PurchaseProofingItemDao;
 import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
 import com.uas.platform.b2b.dao.PurchaseReturnDao;
 import com.uas.platform.b2b.dao.SaleARCheckDao;
@@ -39,12 +40,14 @@ import com.uas.platform.b2b.dao.SaleQuotationDao;
 import com.uas.platform.b2b.dao.SaleSendAllDao;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.PurchaseApCheck;
+import com.uas.platform.b2b.model.PurchaseApCheckDone;
 import com.uas.platform.b2b.model.PurchaseApCheckEnd;
+import com.uas.platform.b2b.model.PurchaseApCheckTodo;
 import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
@@ -124,7 +127,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private MakeAcceptDao makeAcceptDao;
 
 	@Autowired
-	private MakeOrderChangeDao makeOrderChangeDao;
+	private MakeOrderChangeItemDao makeOrderChangeItemDao;
 
 	@Autowired
 	private MakeReturnDao makeReturnDao;
@@ -157,10 +160,13 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private PurchaseOrderWaitingDao purchaseOrderWaitingDao;
 
 	@Autowired
-	private PurchaseProofingItemDao purchaseProofingItemDao;
+	private PurchaseApCheckDao purchaseApCheckDao;
 
 	@Autowired
-	private PurchaseApCheckDao purchaseApCheckDao;
+	private PurchaseApCheckTodoDao purchaseApCheckTodoDao;
+
+	@Autowired
+	private PurchaseApCheckDoneDao purchaseApCheckDoneDao;
 
 	@Autowired
 	private PurchaseApCheckEndDao purchaseApCheckEndDao;
@@ -307,7 +313,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 */
 	@Override
 	public SPage<MakeAccept> searchMakeAcceptIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$RETURN, pageParams);
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.MAKE$ACCEPT, pageParams);
 		return toSPage(idsPage, makeAcceptDao.findAll(idsPage.getContent()));
 	}
 
@@ -315,9 +321,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 * 委外变更单
 	 */
 	@Override
-	public SPage<MakeOrderChange> searchMakeOrderChangeIds(String keyword, PageParams pageParams) {
+	public SPage<MakeOrderChangeItem> searchMakeOrderChangeIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.MAKE$CHANGES, pageParams);
-		return toSPage(idsPage, makeOrderChangeDao.findAll(idsPage.getContent()));
+		return toSPage(idsPage, makeOrderChangeItemDao.findAll(idsPage.getContent()));
 	}
 
 	/**
@@ -383,6 +389,42 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, saleARCheckDao.findAll(idsPage.getContent()));
 	}
 
+	/**
+	 * 应收对账单： purc$apcheck
+	 */
+	@Override
+	public SPage<PurchaseApCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$APCHECK, pageParams);
+		return toSPage(idsPage, purchaseApCheckDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 应收对账单(未对账)： purc$apcheck
+	 */
+	@Override
+	public SPage<PurchaseApCheckTodo> searchPurchaseApCheckTodoIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$APCHECK, pageParams);
+		return toSPage(idsPage, purchaseApCheckTodoDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 应收对账单（已确认）： purc$apcheck
+	 */
+	@Override
+	public SPage<PurchaseApCheckDone> searchPurchaseApCheckDoneIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$APCHECK, pageParams);
+		return toSPage(idsPage, purchaseApCheckDoneDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 应收对账单(不同意)： purc$apcheck
+	 */
+	@Override
+	public SPage<PurchaseApCheckEnd> searchPurchaseApCheckEndIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$APCHECK, pageParams);
+		return toSPage(idsPage, purchaseApCheckEndDao.findAll(idsPage.getContent()));
+	}
+
 	@Override
 	public PageParams convertPageParams(com.uas.platform.core.model.PageParams params, String searchFilter) {
 		if (params == null) {
@@ -447,16 +489,4 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, purchaseOrderWaitingDao.findAll(idsPage.getContent()));
 	}
 
-	@Override
-	public SPage<PurchaseApCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$ARCHECK, pageParams);
-		return toSPage(idsPage, purchaseApCheckDao.findAll(idsPage.getContent()));
-	}
-
-	@Override
-	public SPage<PurchaseApCheckEnd> searchPurchaseApcheckEndIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$ARCHECK, pageParams);
-		return toSPage(idsPage, purchaseApCheckEndDao.findAll(idsPage.getContent()));
-	}
-
 }

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

@@ -3840,7 +3840,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
 						$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
@@ -4056,7 +4056,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				FaApCheck[getState($scope.active )](BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$scope.data = $defer.resolve(page.content);
 						$scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
 //						$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
@@ -5537,7 +5537,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
 					}
@@ -5769,7 +5769,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
 					}
@@ -5853,7 +5853,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
 					}
@@ -5934,7 +5934,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
 					}
@@ -6068,7 +6068,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
 					}