应收对账单的过滤

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

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

@@ -19,11 +19,9 @@ 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.SaleARCheck;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.search.SearchService;
@@ -94,21 +92,28 @@ public class SaleApCheckController {
 	}
 
 	/**
-	 * 作为卖家，获取应付对账单（全部）
+	 * 作为卖家，获取应收对账单（全部）
 	 * 
 	 * @param json
 	 * @return
 	 */
 	@RequestMapping(value = "/getAll", method = RequestMethod.GET)
 	@ResponseBody
-	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);
+	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);
 	}
 
 	/**
@@ -219,7 +224,7 @@ public class SaleApCheckController {
 		// 当前登录企业作为买家
 		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-		pageParams.getFilters().put("pa_checkstatus", String.valueOf("未对账"));
+		pageParams.getFilters().put("pa_checkstatus", "未对账");
 		return searchService.searchPurchaseApCheckIds(keyword, pageParams);
 	}
 
@@ -228,14 +233,14 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseApCheckDone> getDoneApChecks(PageParams params, String keyword) {
+	public SPage<PurchaseApCheck> getDoneApChecks(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 其他过滤条件
-		// pageParams.getFilters().put("pa_checkstatus", "已确认");
-		return searchService.searchPurchaseApCheckDoneIds(keyword, pageParams);
+		pageParams.getFilters().put("pa_checkstatus", "已确认");
+		return searchService.searchPurchaseApCheckIds(keyword, pageParams);
 	}
 
 	/**
@@ -243,14 +248,14 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseApCheckEnd> getEndApChecks(PageParams params, String keyword) {
+	public SPage<PurchaseApCheck> getEndApChecks(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.searchPurchaseApCheckEndIds(keyword, pageParams);
+		pageParams.getFilters().put("pa_checkstatus", "已作废");
+		return searchService.searchPurchaseApCheckIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -7,9 +7,6 @@ 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;
@@ -242,32 +239,7 @@ 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);
-
-	/**
-	 * 应收对帐单（已作废）
-	 * 
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	public SPage<PurchaseApCheckEnd> searchPurchaseApCheckEndIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 将com.uas.platform.core.model.PageParams转为搜索项目下的PageParams

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

@@ -16,9 +16,6 @@ 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;
@@ -46,9 +43,6 @@ 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;
@@ -163,15 +157,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseApCheckDao purchaseApCheckDao;
 
-	@Autowired
-	private PurchaseApCheckTodoDao purchaseApCheckTodoDao;
-
-	@Autowired
-	private PurchaseApCheckDoneDao purchaseApCheckDoneDao;
-
-	@Autowired
-	private PurchaseApCheckEndDao purchaseApCheckEndDao;
-
 	@Autowired
 	private SaleQuotationItemDao saleQuotatioItemDao;
 
@@ -402,33 +387,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		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) {