企业圈接口修改

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

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

@@ -1,14 +1,5 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.support.Page;
 import com.uas.platform.b2b.erp.model.PageInfo;
@@ -19,6 +10,14 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 
 /**
  * erp查询企业圈数据接口
@@ -63,16 +62,19 @@ public class UserSpaceDetailController {
 	
 	/**
 	 * 获取邀请记录
-	 * 
+	 *
 	 * @param data
 	 * @return
 	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(value="/invitations", method = RequestMethod.GET)
-	public Page<InvitationRecord> invitations(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public Page<InvitationRecord> invitations(@RequestParam("data") String data, @RequestParam("onlySelf") String onlySelf) throws UnsupportedEncodingException {
 		Page<InvitationRecord> records = new Page<InvitationRecord>();
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		PageInfo pageInfo = FlexJsonUtils.fromJson(jsonStr, PageInfo.class);
+		onlySelf = URLDecoder.decode(onlySelf, "UTF-8");
+		// 是否只看自己，是为1，查看所有为0
+		Integer ifSelf = FlexJsonUtils.fromJson(onlySelf, Integer.class);
 		com.uas.platform.core.model.PageParams params = new com.uas.platform.core.model.PageParams();
 		params.setPage(pageInfo.getPageNumber());
 		params.setCount(pageInfo.getPageSize());
@@ -83,8 +85,10 @@ public class UserSpaceDetailController {
 			} else {
 				pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 			}
-			if (pageInfo.getUseruu() != null) {
+			if (pageInfo.getUseruu() != null && ifSelf == 1) { // 只看自己就加入自己uu过滤，查看所有就加入已激活状态，只显示已注册邀请。
 				pageParams.getFilters().put("in_useruu", pageInfo.getUseruu());
+			} else {
+				pageParams.getFilters().put("in_active", Constant.YES);
 			}
 			SPage<InvitationRecord> details = searchService.getInvitationByKeyword(pageInfo.getKeyword(), pageParams);
 			records.setContent(details.getContent());

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

@@ -1,28 +1,10 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.uas.account.support.Page;
 import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.erp.model.B2BCustomer;
-import com.uas.platform.b2b.erp.model.B2BVendor;
-import com.uas.platform.b2b.erp.model.PageInfo;
-import com.uas.platform.b2b.erp.model.VendorInfo;
-import com.uas.platform.b2b.erp.model.VendorRate;
+import com.uas.platform.b2b.erp.model.*;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -35,13 +17,25 @@ import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings("deprecation")
 @Controller
@@ -73,16 +67,20 @@ public class VendorRateController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<B2BVendor> getVendors(@RequestParam("pageInfo") String pageInfo) throws UnsupportedEncodingException {
+	public Page<B2BVendor> getVendors(@RequestParam("pageInfo") String pageInfo, @RequestParam("vendUUs") String vendor) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(pageInfo, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
+		vendor = URLDecoder.decode(vendor, "UTF-8");
+		List<Object> vendUUs = JSON.parseArray(vendor, Object.class);
 		String keyword = info.getKeyword();
 		PageParams pageParams = new PageParams();
 		pageParams.setSize(info.getPageSize());
 		pageParams.setPage(info.getPageNumber());
 		ModelMap map = new ModelMap();
 		map.put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
-		map.put("ve_vendswitch", Constant.YES);
+        ModelMap notMap = new ModelMap();
+		notMap.put("ve_vendenuu", new MultiValue(vendUUs, true));
+        pageParams.setNotEqualFilters(notMap);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
@@ -96,27 +94,30 @@ public class VendorRateController {
 	 */
 	@RequestMapping(value = "/customer", method = RequestMethod.GET)
 	@ResponseBody
-	public Page<B2BCustomer> getCustomers(@RequestParam("pageInfo") String pageInfo) throws UnsupportedEncodingException {
+	public Page<B2BCustomer> getCustomers(@RequestParam("pageInfo") String pageInfo, @RequestParam("custUUs") String customer) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(pageInfo, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
+		customer = URLDecoder.decode(customer, "UTF-8");
+		List<Object> custUUs = JSON.parseArray(customer, Object.class);
 		String keyword = info.getKeyword();
 		com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams();
 		pageParams.setSize(info.getPageSize());
 		pageParams.setPage(info.getPageNumber());
 		ModelMap map = new ModelMap();
 		map.put("ve_vendenuu", SystemSession.getUser().getEnterprise().getUu());
-		map.put("ve_custswitch", Constant.YES);
-
+		ModelMap notMap = new ModelMap();
+        notMap.put("ve_myenuu", new MultiValue(custUUs, true));
+        pageParams.setNotEqualFilters(notMap);
 		List<Sort> sortList = new ArrayList<>();
 		SearchFilter filter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		if (filter != null && !org.springframework.util.CollectionUtils.isEmpty(filter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			list.addAll(filter.getDistribute());
-			map.put("ve_myenuu", new MultiValue(list, true));
-		}
+//		if (filter != null && filter.getDistribute() == null) {
+//			return null;
+//		}
+//		if (filter != null && !org.springframework.util.CollectionUtils.isEmpty(filter.getDistribute())) {
+//			List<Object> list = new ArrayList<>();
+//			list.addAll(filter.getDistribute());
+//			map.put("ve_myenuu", new MultiValue(list, true));
+//		}
 		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
@@ -126,22 +127,26 @@ public class VendorRateController {
 	/**
 	 * UAS新的合作伙伴<br>
 	 * 请求者的名义查看个人的发出的请求<br>
-	 * 已通过
+	 * 已通过(全部合作伙伴)
 	 *
 	 * @param data
 	 * @return
 	 */
 	@RequestMapping(value = "/request", method = RequestMethod.GET)
 	@ResponseBody
-	public Page<BasePartnersInfo> getDoneRequest(@RequestParam("data") String data) throws Exception {
+	public Page<BasePartnersInfo> getDoneRequest(@RequestParam("data") String data, @RequestParam("vendUUs") String vendor, @RequestParam("custUUs") String customer) throws Exception {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
+		vendor = URLDecoder.decode(vendor, "UTF-8");
+		List<Long> vendUUs = JSON.parseArray(vendor, Long.class);
+		customer = URLDecoder.decode(customer, "UTF-8");
+		List<Long> custUUs = JSON.parseArray(customer, Long.class);
 		String keyword = info.getKeyword();
 		PageParams pageParams = new PageParams();
 		pageParams.setSize(info.getPageSize());
 		pageParams.setPage(info.getPageNumber());
 		return addPartnerService.findByBusCodeAndKeyWordForERP(keyword, Status.ENABLED.value(), pageParams.getSize(),
-				pageParams.getPage());
+				pageParams.getPage(), vendUUs, custUUs);
 	}
 
 

src/main/java/com/uas/platform/b2b/service/AddPartnerService.java

@@ -1,11 +1,12 @@
 package com.uas.platform.b2b.service;
 
 import com.uas.account.support.Page;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.model.AddPartner;
 import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.search.b2b.model.SPage;
+import org.springframework.ui.ModelMap;
+
+import java.util.List;
 
 public interface AddPartnerService {
 
@@ -92,5 +93,5 @@ public interface AddPartnerService {
 	 * @return
 	 * @throws Exception
 	 */
-    Page<BasePartnersInfo> findByBusCodeAndKeyWordForERP(String keyword, Integer statusCode, int pageSize, int pageNumber) throws Exception;
+    Page<BasePartnersInfo> findByBusCodeAndKeyWordForERP(String keyword, Integer statusCode, int pageSize, int pageNumber, List<Long> vendUUs, List<Long> custUUs) throws Exception;
 }

src/main/java/com/uas/platform/b2b/service/impl/AddPartnerServiceImpl.java

@@ -25,9 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class AddPartnerServiceImpl implements AddPartnerService {
@@ -204,7 +202,11 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	 */
 	@Override
 	public Page<BasePartnersInfo> findByBusCodeAndKeyWordForERP(String keyword, Integer statusCode, int pageSize,
-			int pageNumber) throws Exception {
+			int pageNumber, List<Long> vendUUs, List<Long> custUUs) throws Exception {
+		Set<Long> vendUUSet = new HashSet<>();
+		vendUUSet.addAll(vendUUs);
+		Set<Long> custUUSet = new HashSet<>();
+		custUUSet.addAll(custUUs);
 		String businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
 		Page<PartnershipRecord> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
 				pageSize);
@@ -240,7 +242,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setReason(record.getReason());
 					// 供应商
 					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getVendUID());
-					if (!CollectionUtils.isEmpty(vendor)) {
+					if (!CollectionUtils.isEmpty(vendor) && !vendUUSet.contains(vendor.get(0).getVendEnUU())) {
 						partner.setVendor(Constant.YES);
 						partner.setVendorId(vendor.get(0).getId());
 						partner.setVendswitch(vendor.get(0).getVendswitch());
@@ -249,14 +251,16 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					}
 					// 客户
 					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer)) {
+					if (!CollectionUtils.isEmpty(customer) && !custUUSet.contains(customer.get(0).getMyEnUU())) {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
 					} else {
 						partner.setCustomer(Constant.NO);
 					}
-					baseInfos.add(partner);
+					if (partner.getCustomer() == 1 || partner.getVendor() == 1) {
+						baseInfos.add(partner);
+					}
 				}
 				// vend为当前企业,收到申请
 				if (record.getVendUID().equals(businessCode)) {
@@ -283,7 +287,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setReason(record.getReason());
 					// 供应商
 					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getCustUID());
-					if (!CollectionUtils.isEmpty(vendor)) {
+					if (!CollectionUtils.isEmpty(vendor) && !vendUUSet.contains(vendor.get(0).getMyEnUU())) {
 						partner.setVendor(Constant.YES);
 						partner.setVendorId(vendor.get(0).getId());
 						partner.setVendswitch(vendor.get(0).getVendswitch());
@@ -292,19 +296,21 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					}
 					// 客户
 					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getCustUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer)) {
+					if (!CollectionUtils.isEmpty(customer) && !custUUSet.contains(vendor.get(0).getVendEnUU())) {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
 					} else {
 						partner.setCustomer(Constant.NO);
 					}
-					baseInfos.add(partner);
+					if (partner.getVendor() == 1 || partner.getCustomer() == 1) {
+						baseInfos.add(partner);
+					}
 				}
 			}
 		}
 		partnerRecords.setContent(baseInfos);
-		partnerRecords.setTotalElements(pageRecords != null ? pageRecords.getTotalElements() : 0);
+		partnerRecords.setTotalElements(pageRecords != null ? baseInfos.size() : 0);
 		return partnerRecords;
 	}