委外加工单过滤条件修改

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

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

@@ -122,6 +122,7 @@ public class MakeOrderController {
 			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("ma_status", Status.REPLIED.value());
+		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
@@ -157,6 +158,7 @@ public class MakeOrderController {
 			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("ma_status", Status.NOT_REPLY.value());
+		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -134,9 +134,9 @@ public class TenderController {
 
     /**
      *  获取平台供应商
-     * @param params
-     * @param keyword
-     * @return
+     * @param params  分页参数
+     * @param keyword  关键词
+     * @return  企业信息分页
      */
     @RequestMapping(value = "/vendors", method = RequestMethod.GET)
     public SPage<Enterprise> getVendors(PageParams params, String keyword) {
@@ -354,8 +354,8 @@ public class TenderController {
     /**
      * 作为采购方，查看发出的招标单（全部）
      *
-     * @param params
-     * @return
+     * @param params 分页参数
+     * @return   招标单分页
      */
     @RequestMapping(value = "/purc", method = RequestMethod.GET)
     @ResponseBody
@@ -393,8 +393,8 @@ public class TenderController {
     /**
      * 作为采购方，查看发出的招标单（待评标）
      *
-     * @param params
-     * @return
+     * @param params  分页参数
+     * @return   招标单分页
      */
     @RequestMapping(value = "/purc",params = RequestState.DONE, method = RequestMethod.GET)
     @ResponseBody

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

@@ -281,15 +281,6 @@ public interface SearchService {
 	 */
 	SPage<PurchaseTender> erpSearchPurcTenderIds(String keyword, PageParams pageParams);
 
-	/**
-	 * 公开招标单
-	 *
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	SPage<PurchaseTender> erpSearchOpenPurcTenderIds(String keyword, PageParams pageParams);
-
 	/**
 	 * 将com.uas.platform.core.model.PageParams转为搜索项目下的PageParams
 	 * 

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

@@ -738,36 +738,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, tenderList);
 	}
 
-	/**
-	 *  erp查看公开招标单
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	@Override
-	public SPage<PurchaseTender> erpSearchOpenPurcTenderIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$TENDER, pageParams);
-		List<PurchaseTender> content = purchaseTenderDao.findAll(idsPage.getContent());
-		List<PurchaseTender> tenderList = new ArrayList<>();
-		Set<PurchaseTenderProd> prods = new HashSet<>();
-		Long currentUU = SystemSession.getUser().getEnterprise().getUu();
-		for (PurchaseTender tender : content) {  //过滤掉本企业的公开招标单
-			if (currentUU.intValue() != tender.getEnUU().intValue()) {
-				tender.setPurchaseTenderProds(prods); // erp查看列表只返回主表信息
-				tenderList.add(tender);
-			}
-		}
-		Integer totalElement = tenderList.size(); // 根据新的单据List修改页面参数
-		Integer totalPage = totalElement/idsPage.getSize();
-		if (totalPage < 1) {
-			totalPage = 1;
-		}
-		idsPage.setTotalElement(totalElement);
-		idsPage.setTotalPage(totalPage);
-		sortByProperty(tenderList, PurchaseTender.class, "id", idsPage.getContent());
-		return toSPage(idsPage, tenderList);
-	}
-
 	/**
 	 * 供应商，客户
 	 */