企业圈功能更改，数据显示和操作在平台进行

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

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

@@ -1,21 +1,27 @@
 package com.uas.platform.b2b.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.account.entity.PartnershipRecord;
+import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.model.AddPartner;
-import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.AddPartnerService;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.web.bind.RequestState;
+import com.uas.search.b2b.model.SPage;
 
 /**
  * 添加合作伙伴
@@ -30,73 +36,6 @@ public class AddPartnerController {
 	@Autowired
 	private AddPartnerService addPartnerService;
 
-	/**
-	 * 接收到的请求<br>
-	 * 企业的名义查看新的消息<br>
-	 * 全部
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/message", method = RequestMethod.GET)
-	@ResponseBody
-	public Page<AddPartner> getAllMessage(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("supplieruu", SystemSession.getUser().getEnterprise().getUu());
-		return addPartnerService.findBysupplieruu(info, null);
-	}
-
-	/**
-	 * 接收到的请求<br>
-	 * 企业的名义查看新的消息<br>
-	 * 待回复
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/message", params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<AddPartner> getTodoMessage(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("supplieruu", SystemSession.getUser().getEnterprise().getUu());
-		info.filter("applyStatuscode", Status.NOT_REPLY.value());
-		return addPartnerService.findBysupplieruu(info, null);
-	}
-
-	/**
-	 * 接收到的请求<br>
-	 * 企业的名义查看新的消息<br>
-	 * 已通过
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/message", params = RequestState.DONE, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<AddPartner> getDoneMessage(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("supplieruu", SystemSession.getUser().getEnterprise().getUu());
-		info.filter("applyStatuscode", Status.AGREED.value());
-		return addPartnerService.findBysupplieruu(info, null);
-	}
-
-	/**
-	 * 接收到的请求<br>
-	 * 企业的名义查看新的消息<br>
-	 * 未通过
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/message", params = RequestState.END, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<AddPartner> getMessage(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("supplieruu", SystemSession.getUser().getEnterprise().getUu());
-		info.filter("applyStatuscode", Status.NOTAGREED.value());
-		return addPartnerService.findBysupplieruu(info, null);
-	}
-
 	/**
 	 * 已发出的请求<br>
 	 * 请求者的名义查看个人的发出的请求<br>
@@ -107,11 +46,8 @@ public class AddPartnerController {
 	 */
 	@RequestMapping(value = "/request", method = RequestMethod.GET)
 	@ResponseBody
-	public Page<AddPartner> getAllRequest(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("applicantuu", SystemSession.getUser().getUserUU());
-		info.filter("clientuu", SystemSession.getUser().getEnterprise().getUu());
-		return addPartnerService.findByApplicantuu(info, null);
+	public SPage<BasePartnersInfo> getAllRequest(PageParams params, String keyword) throws Exception {
+		return addPartnerService.findByBusCodeAndKeyWord(keyword, null, params.getCount(), params.getPage());
 	}
 
 	/**
@@ -121,15 +57,13 @@ public class AddPartnerController {
 	 * 
 	 * @param params
 	 * @return
+	 * @throws Exception
 	 */
 	@RequestMapping(value = "/request", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<AddPartner> getTodoRequest(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("applicantuu", SystemSession.getUser().getUserUU());
-		info.filter("clientuu", SystemSession.getUser().getEnterprise().getUu());
-		info.filter("applyStatuscode", Status.NOT_REPLY.value());
-		return addPartnerService.findByApplicantuu(info, null);
+	public SPage<BasePartnersInfo> getTodoRequest(PageParams params, String keyword) throws Exception {
+		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAUDIT.value(), params.getCount(),
+				params.getPage());
 	}
 
 	/**
@@ -142,12 +76,9 @@ public class AddPartnerController {
 	 */
 	@RequestMapping(value = "/request", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<AddPartner> getDoneRequest(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("applicantuu", SystemSession.getUser().getUserUU());
-		info.filter("clientuu", SystemSession.getUser().getEnterprise().getUu());
-		info.filter("applyStatuscode", Status.AGREED.value());
-		return addPartnerService.findByApplicantuu(info, null);
+	public SPage<BasePartnersInfo> getDoneRequest(PageParams params, String keyword) throws Exception {
+		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.ENABLED.value(), params.getCount(),
+				params.getPage());
 	}
 
 	/**
@@ -160,12 +91,9 @@ public class AddPartnerController {
 	 */
 	@RequestMapping(value = "/request", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
-	public Page<AddPartner> getEndRequest(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		info.filter("applicantuu", SystemSession.getUser().getUserUU());
-		info.filter("clientuu", SystemSession.getUser().getEnterprise().getUu());
-		info.filter("applyStatuscode", Status.NOTAGREED.value());
-		return addPartnerService.findByApplicantuu(info, null);
+	public SPage<BasePartnersInfo> getEndRequest(PageParams params, String keyword) throws Exception {
+		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAPPLY.value(), params.getCount(),
+				params.getPage());
 	}
 
 	/**
@@ -173,11 +101,32 @@ public class AddPartnerController {
 	 * 
 	 * @param uu
 	 * @return
+	 * @throws Exception
 	 */
-	@RequestMapping(value = "/request/{uu}", method = RequestMethod.POST)
+	@RequestMapping(value = "/request/nameAndBusCode", method = RequestMethod.POST)
 	@ResponseBody
-	public AddPartner addNewPartner(@PathVariable("uu") Long uu) {
-		return addPartnerService.addNewPartner(uu);
+	public ResponseEntity<ModelMap> addNewPartner(String name, String businessCode)
+			throws Exception {
+		PartnershipRecord newrecord = new PartnershipRecord();
+		ModelMap map = new ModelMap();
+		if (businessCode.equals(SystemSession.getUser().getEnterprise().getEnBussinessCode())) {
+			map.put("error", "不能添加自己为合作伙伴");
+		} else {
+			newrecord.setVendName(name);
+			newrecord.setVendUID(businessCode);
+			newrecord.setAppId("b2b");
+			newrecord.setCustName(SystemSession.getUser().getEnterprise().getEnName());
+			newrecord.setCustUID(SystemSession.getUser().getEnterprise().getEnBussinessCode());
+			newrecord.setCustUserCode(String.valueOf(SystemSession.getUser().getUserUU()));
+			newrecord.setCustUserEmail(SystemSession.getUser().getUserEmail());
+			newrecord.setCustUserName(SystemSession.getUser().getUserName());
+			newrecord.setCustUserTel(SystemSession.getUser().getUserTel());
+			String result = AccountUtils.addNewRecord(newrecord);
+			JSONObject object = JSON.parseObject(result);
+			map.put("error", object.getString("error"));
+			map.put("success", object.getString("success"));
+		}
+		return new ResponseEntity<ModelMap>(map, HttpStatus.OK);
 	}
 
 	/**
@@ -194,11 +143,16 @@ public class AddPartnerController {
 
 	/**
 	 * 企业同意申请
+	 * 
+	 * @throws Exception
 	 */
 	@RequestMapping(value = "/agree/{id}", method = RequestMethod.POST)
 	@ResponseBody
-	public AddPartner agreeRequest(@PathVariable("id") Long id) {
-		return addPartnerService.agreeRequest(id);
+	public ModelMap agreeRequest(@PathVariable("id") Long id) throws Exception {
+		ModelMap map = new ModelMap();
+		String result = AccountUtils.acceptRequest(id, SystemSession.getUser().getUserTel(), "b2b");
+		map.put("result", result);
+		return map;
 	}
 
 	/**
@@ -207,11 +161,15 @@ public class AddPartnerController {
 	 * @param id
 	 * @param reason
 	 * @return
+	 * @throws Exception
 	 */
 	@RequestMapping(value = "/refuse/{id}", method = RequestMethod.POST)
 	@ResponseBody
-	public AddPartner refuseRequest(@PathVariable("id") Long id, String reason) {
-		return addPartnerService.refuseRequest(id, reason);
+	public ModelMap refuseRequest(@PathVariable("id") Long id, String reason) throws Exception {
+		ModelMap map = new ModelMap();
+		String result = AccountUtils.rejectRequest(id, reason, SystemSession.getUser().getUserTel(), "b2b");
+		map.put("result", result);
+		return map;
 	}
 
 	/**
@@ -220,10 +178,10 @@ public class AddPartnerController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/addSupplier/{id}", method = RequestMethod.POST)
+	@RequestMapping(value = "/addSupplier/{businessCode}", method = RequestMethod.POST)
 	@ResponseBody
-	public Vendor addSupplier(@PathVariable("id") Long id) {
-		return addPartnerService.addSupplier(id);
+	public ModelMap addSupplier(@PathVariable("businessCode") String businessCode) {
+		return addPartnerService.addSupplier(businessCode);
 	}
 
 	/**
@@ -232,9 +190,9 @@ public class AddPartnerController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/addCust/{id}", method = RequestMethod.POST)
+	@RequestMapping(value = "/addCust/{businessCode}", method = RequestMethod.POST)
 	@ResponseBody
-	public Vendor addCust(@PathVariable("id") Long id) {
-		return addPartnerService.addCust(id);
+	public ModelMap addCust(@PathVariable("businessCode") String businessCode) {
+		return addPartnerService.addCust(businessCode);
 	}
 }

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

@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.uas.account.entity.UserSpaceDetail;
+import com.uas.account.support.Page;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.FileUpload;
@@ -259,10 +261,37 @@ public class BaseInfoController {
 		return baseInfoService.addSupplier(partner);
 	}
 
+	/**
+	 * 跳转到企业圈
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
 	@RequestMapping(value = "/enterbusinessGroups", method = RequestMethod.GET)
 	public ModelMap enterBusinessGroups() throws Exception {
 		ModelMap map = new ModelMap();
 		map.put("url", AccountUtils.redirectContactPage());
 		return map;
 	}
+
+	/**
+	 * 通过关键词查询账户中心的相关的企业信息
+	 * 
+	 * @param keyword
+	 * @param pageNumber
+	 * @param pageSize
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/getUserSpaceDetails", method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword)
+			throws Exception {
+		Page<UserSpaceDetail> details = AccountUtils.getUserSpacesByKeyword(keyword, params.getPage(),
+				params.getCount());
+		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
+		userSpaceDetails.setContent(details.getContent());
+		userSpaceDetails.setTotalElement(details.getTotalElements());
+		return userSpaceDetails;
+	}
 }

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

@@ -1,30 +1,13 @@
 package com.uas.platform.b2b.service;
 
-import org.springframework.data.domain.Page;
+import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.model.AddPartner;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
+import com.uas.search.b2b.model.SPage;
 
 public interface AddPartnerService {
 
-	/**
-	 * 通过申请人uu查询已发出的请求
-	 * 
-	 * @param applicantuu
-	 * @return
-	 */
-	public Page<AddPartner> findByApplicantuu(PageInfo pageInfo, SearchFilter filter);
-
-	/**
-	 * 供应商企业uu查询待审核的请求
-	 * 
-	 * @param supplieruu
-	 * @return
-	 */
-	public Page<AddPartner> findBysupplieruu(PageInfo pageInfo, SearchFilter filter);
-
 	/**
 	 * 向指定的企业发出建立合作关系请求
 	 * 
@@ -71,7 +54,7 @@ public interface AddPartnerService {
 	 * @param id
 	 * @return
 	 */
-	public Vendor addSupplier(Long id);
+	public ModelMap addSupplier(String businessCode);
 
 	/**
 	 * 添加为客户
@@ -79,5 +62,15 @@ public interface AddPartnerService {
 	 * @param id
 	 * @return
 	 */
-	public Vendor addCust(Long id);
+	public ModelMap addCust(String businessCode);
+
+	/**
+	 * 分页查询请求
+	 * 
+	 * @param businessCode
+	 * @param keyword
+	 * @return
+	 */
+	public SPage<BasePartnersInfo> findByBusCodeAndKeyWord(String keyword, Integer statusCode, int pageSize,
+			int pageNumber) throws Exception;
 }

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

@@ -1,34 +1,33 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
+import com.uas.account.entity.PartnershipRecord;
+import com.uas.account.support.Page;
+import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.dao.AddPartnerDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.model.AddPartner;
 import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.AddPartnerService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
+import com.uas.search.b2b.model.SPage;
 
 @Service
 public class AddPartnerServiceImpl implements AddPartnerService {
@@ -47,28 +46,6 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	@Autowired
 	private UserBaseInfoDao userBaseInfoDao;
 
-	@Override
-	public Page<AddPartner> findByApplicantuu(final PageInfo pageInfo, SearchFilter filter) {
-		Page<AddPartner> pageLogs = addPartnerDao.findAll(new Specification<AddPartner>() {
-			public Predicate toPredicate(Root<AddPartner> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-		return pageLogs;
-	}
-
-	@Override
-	public Page<AddPartner> findBysupplieruu(final PageInfo pageInfo, SearchFilter filter) {
-		Page<AddPartner> pageLogs = addPartnerDao.findAll(new Specification<AddPartner>() {
-			public Predicate toPredicate(Root<AddPartner> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-		return pageLogs;
-	}
-
 	@Override
 	public AddPartner addNewPartner(Long uu) {
 		AddPartner adpa = addPartnerDao.findByClientuuAndSupplieruu(SystemSession.getUser().getEnterprise().getUu(),
@@ -155,51 +132,111 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	}
 
 	@Override
-	public Vendor addSupplier(Long id) {
-		AddPartner adp = addPartnerDao.findOne(id);
+	public ModelMap addSupplier(String businessCode) {
+		Enterprise vendEnter = enterpriseDao.findEnterpriseByEnBussinessCode(businessCode);
+		Enterprise myEnter = SystemSession.getUser().getEnterprise();
+		ModelMap map = new ModelMap();
 		// 先判断是否为供应商
-		List<Vendor> oldVendor = vendorDao.findByMyEnUUAndVendUU(adp.getClientuu(), adp.getSupplieruu());
+		List<Vendor> oldVendor = vendorDao.findByMyEnUUAndVendUU(myEnter.getUu(), vendEnter.getUu());
 		if (!CollectionUtils.isEmpty(oldVendor)) {
-			throw new IllegalAccessError("该企业已经是您的供应商，请不要重复添加");
+			map.put("error", "该企业已经是您的供应商，请不要重复添加");
+		} else {
+			Vendor vendor = new Vendor();
+			UserBaseInfo vendUser = userBaseInfoDao.findByUserUU(myEnter.getEnAdminuu());
+			UserBaseInfo myUser = userBaseInfoDao.findByUserUU(vendEnter.getEnAdminuu());
+			vendor.setMyEnterprise(myEnter);
+			vendor.setMyEnUU(myEnter.getUu());
+			vendor.setMyUser(myUser);
+			vendor.setMyUserUU(myEnter.getEnAdminuu());
+			vendor.setVendorEnterprise(vendEnter);
+			vendor.setVendorUser(vendUser);
+			vendor.setVendUserUU(vendEnter.getEnAdminuu());
+			vendor.setVendEnUU(vendEnter.getUu());
+			vendorDao.save(vendor);
+			map.put("success", "添加供应商成功");
 		}
-		Vendor vendor = new Vendor();
-		Enterprise vendenter = enterpriseDao.findEnterpriseByUu(adp.getSupplieruu());
-		Enterprise myenter = enterpriseDao.findEnterpriseByUu(adp.getClientuu());
-		UserBaseInfo venduser = userBaseInfoDao.findByUserUU(adp.getAuditoruu());
-		UserBaseInfo myuser = userBaseInfoDao.findByUserUU(adp.getApplicantuu());
-		vendor.setMyEnterprise(myenter);
-		vendor.setMyEnUU(adp.getClientuu());
-		vendor.setMyUser(myuser);
-		vendor.setMyUserUU(adp.getApplicantuu());
-		vendor.setVendorEnterprise(vendenter);
-		vendor.setVendorUser(venduser);
-		vendor.setVendUserUU(adp.getAuditoruu());
-		vendor.setVendEnUU(adp.getSupplieruu());
-		return vendorDao.save(vendor);
+		return map;
 	}
 
 	@Override
-	public Vendor addCust(Long id) {
-		AddPartner adp = addPartnerDao.findOne(id);
+	public ModelMap addCust(String businessCode) {
+		Enterprise vendEnter = enterpriseDao.findEnterpriseByEnBussinessCode(businessCode);
+		Enterprise myEnter = SystemSession.getUser().getEnterprise();
+		ModelMap map = new ModelMap();
 		// 先判断是否为客户
-		List<Vendor> oldVendor = vendorDao.findByMyEnUUAndVendUU(adp.getSupplieruu(), adp.getClientuu());
+		List<Vendor> oldVendor = vendorDao.findByMyEnUUAndVendUU(vendEnter.getUu(), myEnter.getUu());
 		if (!CollectionUtils.isEmpty(oldVendor)) {
-			throw new IllegalAccessError("该企业已经是您的客户，请不要重复添加");
+			map.put("error", "该企业已经是您的客户，请不要重复添加");
+		} else {
+			Vendor vendor = new Vendor();
+			UserBaseInfo vendUser = userBaseInfoDao.findByUserUU(vendEnter.getEnAdminuu());
+			UserBaseInfo myUser = userBaseInfoDao.findByUserUU(myEnter.getEnAdminuu());
+			vendor.setMyEnterprise(vendEnter);
+			vendor.setMyEnUU(vendEnter.getUu());
+			vendor.setMyUser(vendUser);
+			vendor.setMyUserUU(vendUser.getUserUU());
+			vendor.setVendorEnterprise(myEnter);
+			vendor.setVendorUser(myUser);
+			vendor.setVendUserUU(myUser.getUserUU());
+			vendor.setVendEnUU(myEnter.getUu());
+			vendorDao.save(vendor);
+			map.put("success", "添加客户成功");
 		}
-		Vendor vendor = new Vendor();
-		Enterprise vendenter = enterpriseDao.findEnterpriseByUu(adp.getSupplieruu());
-		Enterprise myenter = enterpriseDao.findEnterpriseByUu(adp.getClientuu());
-		UserBaseInfo venduser = userBaseInfoDao.findByUserUU(adp.getAuditoruu());
-		UserBaseInfo myuser = userBaseInfoDao.findByUserUU(adp.getApplicantuu());
-		vendor.setMyEnterprise(vendenter);
-		vendor.setMyEnUU(adp.getSupplieruu());
-		vendor.setMyUser(venduser);
-		vendor.setMyUserUU(adp.getAuditoruu());
-		vendor.setVendorEnterprise(myenter);
-		vendor.setVendorUser(myuser);
-		vendor.setVendUserUU(adp.getApplicantuu());
-		vendor.setVendEnUU(adp.getClientuu());
-		return vendorDao.save(vendor);
+		return map;
 	}
 
+	@Override
+	public SPage<BasePartnersInfo> findByBusCodeAndKeyWord(String keyword, Integer statusCode, int pageSize,
+			int pageNumber) throws Exception {
+		String businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
+		Page<PartnershipRecord> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
+				pageSize);
+		SPage<BasePartnersInfo> partnerRecords = new SPage<BasePartnersInfo>();
+		List<PartnershipRecord> records = pageRecords.getContent();
+		List<BasePartnersInfo> baseInfos = new ArrayList<BasePartnersInfo>();
+		if (!CollectionUtils.isEmpty(records)) {
+			for (PartnershipRecord record : records) {
+				BasePartnersInfo partner = new BasePartnersInfo();
+				// cust为当前企业,发出申请
+				if (record.getCustUID().equals(businessCode)) {
+					partner.setRequestDate(record.getRequestDate());
+					partner.setAppId(record.getAppId());
+					partner.setId(record.getId());
+					partner.setOperateDate(record.getOperateDate());
+					partner.setVendName(record.getVendName());
+					partner.setVendUID(record.getVendUID());
+					partner.setVendUserCode(record.getVendUserCode());
+					partner.setVendUserName(record.getVendUserName());
+					partner.setVendUserTel(record.getVendUserTel());
+					partner.setMethod(Constant.YES);
+					partner.setStatusCode(record.getStatusCode());
+					partner.setCustUserName(record.getCustUserName());
+					partner.setCustUserTel(record.getCustUserTel());
+					partner.setReason(record.getReason());
+					baseInfos.add(partner);
+				}
+				// vend为当前企业,收到申请
+				if (record.getVendUID().equals(businessCode)) {
+					partner.setRequestDate(record.getRequestDate());
+					partner.setAppId(record.getAppId());
+					partner.setOperateDate(record.getOperateDate());
+					partner.setId(record.getId());
+					partner.setVendName(record.getCustName());
+					partner.setVendUID(record.getCustUID());
+					partner.setVendUserCode(record.getVendUserCode());
+					partner.setVendUserName(record.getVendUserName());
+					partner.setVendUserTel(record.getVendUserTel());
+					partner.setMethod(Constant.NO);
+					partner.setStatusCode(record.getStatusCode());
+					partner.setCustUserName(record.getCustUserName());
+					partner.setCustUserTel(record.getCustUserTel());
+					partner.setReason(record.getReason());
+					baseInfos.add(partner);
+				}
+			}
+		}
+		partnerRecords.setContent(baseInfos);
+		partnerRecords.setTotalElement(pageRecords.getTotalElements());
+		return partnerRecords;
+	}
 }

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

@@ -15,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.uas.account.entity.PartnershipRecord;
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.dao.ComponentDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.ProductDao;
@@ -300,45 +298,45 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 
 	@Override
 	public List<BasePartnersInfo> getPartnersInfosByBusinessCode(String businessCode) throws Exception {
-		List<BasePartnersInfo> partners = new ArrayList<BasePartnersInfo>();
-
-		List<PartnershipRecord> records = AccountUtils
-				.getAllPartnerInfos(SystemSession.getUser().getEnterprise().getEnBussinessCode());
-		System.out.println("records " + records);
-		if (!CollectionUtils.isEmpty(records)) {
-			for (PartnershipRecord record : records) {
-				BasePartnersInfo partner = new BasePartnersInfo();
-				// cust为当前企业
-				if (record.getCustUID().equals(businessCode)) {
-					partner.setRequestDate(record.getRequestDate());
-					partner.setAppId(record.getAppId());
-					partner.setId(record.getId());
-					partner.setOperateDate(record.getOperateDate());
-					partner.setVendName(record.getVendName());
-					partner.setVendUID(record.getVendUID());
-					partner.setVendUserCode(record.getVendUserCode());
-					partner.setVendUserName(record.getVendUserName());
-					partner.setVendUserTel(record.getVendUserTel());
-					partner.setVendUserEmail(record.getVendUserEmail());
-					partners.add(partner);
-				}
-				// vend为当前企业
-				if (record.getVendUID().equals(businessCode)) {
-					partner.setRequestDate(record.getRequestDate());
-					partner.setAppId(record.getAppId());
-					partner.setOperateDate(record.getOperateDate());
-					partner.setId(record.getId());
-					partner.setVendName(record.getCustName());
-					partner.setVendUID(record.getCustUID());
-					partner.setVendUserCode(record.getCustUserCode());
-					partner.setVendUserName(record.getCustUserName());
-					partner.setVendUserTel(record.getCustUserTel());
-					partner.setVendUserEmail(record.getCustUserEmail());
-					partners.add(partner);
-				}
-			}
-		}
-		return partners;
+		// List<BasePartnersInfo> partners = new ArrayList<BasePartnersInfo>();
+		//
+		// List<PartnershipRecord> records = AccountUtils
+		// .getAllPartnerInfos(SystemSession.getUser().getEnterprise().getEnBussinessCode());
+		// if (!CollectionUtils.isEmpty(records)) {
+		// for (PartnershipRecord record : records) {
+		// BasePartnersInfo partner = new BasePartnersInfo();
+		// // cust为当前企业
+		// if (record.getCustUID().equals(businessCode)) {
+		// partner.setRequestDate(record.getRequestDate());
+		// partner.setAppId(record.getAppId());
+		// partner.setId(record.getId());
+		// partner.setOperateDate(record.getOperateDate());
+		// partner.setVendName(record.getVendName());
+		// partner.setVendUID(record.getVendUID());
+		// partner.setVendUserCode(record.getVendUserCode());
+		// partner.setVendUserName(record.getVendUserName());
+		// partner.setVendUserTel(record.getVendUserTel());
+		// partner.setVendUserEmail(record.getVendUserEmail());
+		// partners.add(partner);
+		// }
+		// // vend为当前企业
+		// if (record.getVendUID().equals(businessCode)) {
+		// partner.setRequestDate(record.getRequestDate());
+		// partner.setAppId(record.getAppId());
+		// partner.setOperateDate(record.getOperateDate());
+		// partner.setId(record.getId());
+		// partner.setVendName(record.getCustName());
+		// partner.setVendUID(record.getCustUID());
+		// partner.setVendUserCode(record.getCustUserCode());
+		// partner.setVendUserName(record.getCustUserName());
+		// partner.setVendUserTel(record.getCustUserTel());
+		// partner.setVendUserEmail(record.getCustUserEmail());
+		// partners.add(partner);
+		// }
+		// }
+		// }
+		// return partners;
+		return null;
 	}
 
 }

src/main/java/com/uas/platform/b2b/temporary/model/BasePartnersInfo.java

@@ -67,6 +67,33 @@ public class BasePartnersInfo implements Serializable {
 	 */
 	private Date operateDate;
 
+	/**
+	 * 操作方式，接收or发<br>
+	 * send: 1<br>
+	 * get: 0
+	 */
+	private Short method;
+
+	/**
+	 * 状态
+	 */
+	private Integer statusCode;
+
+	/**
+	 * 申请人
+	 */
+	private String custUserName;
+
+	/**
+	 * 申请人联系方式
+	 */
+	private String custUserTel;
+
+	/**
+	 * 原因
+	 */
+	private String reason;
+
 	public Long getId() {
 		return id;
 	}
@@ -147,12 +174,53 @@ public class BasePartnersInfo implements Serializable {
 		this.operateDate = operateDate;
 	}
 
+	public Short getMethod() {
+		return method;
+	}
+
+	public void setMethod(Short method) {
+		this.method = method;
+	}
+
+	public Integer getStatusCode() {
+		return statusCode;
+	}
+
+	public void setStatusCode(Integer statusCode) {
+		this.statusCode = statusCode;
+	}
+
+	public String getCustUserName() {
+		return custUserName;
+	}
+
+	public void setCustUserName(String custUserName) {
+		this.custUserName = custUserName;
+	}
+
+	public String getCustUserTel() {
+		return custUserTel;
+	}
+
+	public void setCustUserTel(String custUserTel) {
+		this.custUserTel = custUserTel;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
 	@Override
 	public String toString() {
 		return "BasePartnersInfo [id=" + id + ", appId=" + appId + ", requestDate=" + requestDate + ", vendName="
 				+ vendName + ", vendUID=" + vendUID + ", vendUserName=" + vendUserName + ", vendUserTel=" + vendUserTel
 				+ ", vendUserEmail=" + vendUserEmail + ", vendUserCode=" + vendUserCode + ", operateDate=" + operateDate
-				+ "]";
+				+ ", method=" + method + ", statusCode=" + statusCode + ", custUserName=" + custUserName
+				+ ", custUserTel=" + custUserTel + ", reason=" + reason + "]";
 	}
 
 }

src/main/webapp/resources/tpl/index/baseInfo/enterpriseList.html

@@ -138,13 +138,13 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
 <div class="condition block">
 		<div class="row">
 			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称、物料信息、uu号进行搜索" />
-						<div class="search-advance text-link" ng-class="{'active': searchAdvance}" dropdown-toggle>高级搜索</div>
+						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称、管理员姓名进行搜索" />
 						<div id="searchContainer" class="dropdown-menu">
 						</div>
 						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
@@ -161,7 +161,7 @@
 <table class="enterprise-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th width="120">企业UU</th>
+			<th width="120">营业执照</th>
 			<th width="200">企业名称</th>
 			<th width="200">简称</th>
 			<th width="300">地址</th>
@@ -177,25 +177,28 @@
 	<tbody ng-repeat="enterprise in $data">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
 			<td width="120" class="text-center">
-				<span ng-bind="::enterprise.uu" ></span>
+				<span ng-bind="::enterprise.businessCode" ></span>
 			</td>
-			<td width="200" class="text-center"><span ng-bind="::enterprise.enName" class="text-center"></span></td>
-			<td width="200" class="text-center"><span ng-bind="::enterprise.enShortname"></span>
+			<td width="200" class="text-center"><span ng-bind="::enterprise.name" class="text-center"></span></td>
+			<td width="200" class="text-center"><span ng-bind="::enterprise.shortName"></span>
 			</td>
-			<td width="300" class="text-center"><span ng-bind="enterprise.enAddress"></span>
+			<td width="300" class="text-center"><span ng-bind="enterprise.area"></span>
 			</td>
-			<td width="100" class="text-center"><a ng-click="addPartner(enterprise.uu)">添加合作关系<i class="fa fa-user-plus"></i></a>
+			<td width="100" class="text-center"><a ng-click="addPartner(enterprise.name,enterprise.businessCode)"><i class="fa fa-user-plus">合作伙伴</i></a>
 			</td>
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
 			<td class="product" width="150">
 				<div class="">
-					联系人：
-					<span ng-bind="::enterprise.enCorporation"></span>
+					管理员：
+					<span ng-bind="::enterprise.adminName"></span>
 				</div>
-				<div class="text-muted" ng-bind="::enterprise.enTel"></div>
+				<div class="text-muted" ng-bind="::enterprise.adminTel"></div>
+				<div class="text-muted" ng-bind="::enterprise.adminEmail"></div>
 			</td>
 			<td class="text-center br-l">
+				企业类型：
+				<span class="text-muted" ng-bind="::enterprise.industry"></span>
 			</td>
 			<td class="text-center">
 			</td>

src/main/webapp/resources/tpl/index/baseInfo/left.html

@@ -6,24 +6,24 @@
 </div>
 <div class="left-nav">
 	<div class="nav-label">
-		<i></i>物料管理
+		<i></i>企业列表
 	</div>
 	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="baseInfo.prodList">物料列表</a></li>
-		<li ui-sref-active="active"><a ui-sref="baseInfo.uploadByBatch">批量导入</a></li>
+		<!-- <li ui-sref-active="active"><a ui-sref="account.enList">账户信息</a></li> -->
+	<!-- 	<li ui-sref-active="active"><a ui-sref="baseInfo.businessGroups">企业圈</a></li> -->
+		<li ui-sref-active="active"><a ui-sref="baseInfo.enterpriseList">企业圈</a></li>
+	<!-- 	<li ui-sref-active="active"><a ui-sref="baseInfo.enterpriseList">企业列表</a></li> -->
+<!-- 		<li ui-sref-active="active"><a ui-sref="baseInfo.myRequest">我发出的请求</a></li>
+		<li ui-sref-active="active"><a ui-sref="baseInfo.myMessage">我收到的请求</a></li> -->
 	</ul>
 </div>
 <div class="left-nav">
 	<div class="nav-label">
-		<i></i>企业列表
+		<i></i>物料管理
 	</div>
 	<ul class="list-unstyled">
-		<!-- <li ui-sref-active="active"><a ui-sref="account.enList">账户信息</a></li> -->
-		<li ui-sref-active="active"><a ui-sref="baseInfo.businessGroups">企业圈</a></li>
-		<li ui-sref-active="active"><a ui-sref="baseInfo.myPartners">合作伙伴</a></li>
-		<!-- <li ui-sref-active="active"><a ui-sref="baseInfo.enterpriseList">企业列表</a></li> -->
-		<!-- <li ui-sref-active="active"><a ui-sref="baseInfo.myRequest">我发出的请求</a></li>
-		<li ui-sref-active="active"><a ui-sref="baseInfo.myMessage">我收到的请求</a></li> -->
+		<li ui-sref-active="active"><a ui-sref="baseInfo.prodList">物料列表</a></li>
+		<li ui-sref-active="active"><a ui-sref="baseInfo.uploadByBatch">批量导入</a></li>
 	</ul>
 </div>
 <div class="left-nav">

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -149,7 +149,7 @@
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待回复</button>
+							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待处理</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
@@ -161,6 +161,14 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-5">
+				<div class="search">
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />
+						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+					</div>
+				</div>
+			</div>
 			<div class="col-xs-1">
 				<div class="text-default f14 total">
 					共 <span ng-bind="tableParams.total()" class="text-num"></span>
@@ -171,12 +179,12 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th width="120" class="text-center">供应商名称</th>
-			<th width="80" class="text-center">供应商UU</th>
-			<th width="100" class="text-center">申请人</th>
-			<th width="120" class="text-center">回复状态</th>
-			<th width="180" class="text-center">原因</th>
-			<th width="80" class="text-center">操作</th>
+			<th width="120" class="text-center">企业名称</th>
+			<th width="120" class="text-center">营业执照</th>
+			<th width="80" class="text-center">申请人</th>
+			<th width="80" class="text-center">审核人</th>
+			<th width="120" class="text-center">原因</th>
+			<th width="120" class="text-center">操作</th>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -195,21 +203,25 @@
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 			<td class="first" class="text-center">
 				<div class="order-main" >
-					<span ng-bind="request.supplier"></span>
+					<span ng-bind="request.vendName"></span>
 				</div>
 			</td>
-			<td colspan="1" class="text-center"><span ng-bind="::request.supplieruu"></span></td>
+			<td colspan="1" class="text-center"><span ng-bind="::request.vendUID"></span></td>
 			<td colspan="1" class="text-center">
-				<span ng-bind="::request.applicant"></span>
+				<span ng-bind="::request.custUserName"></span>
 			</td>
 			<td colspan="1" class="text-center">
-				<span ng-bind="request.applyStatus"></span>
+				<span ng-bind="request.vendUserName"></span>
 			</td>
 			<td colspan="1" class="text-center">
-				<span ng-bind="request.reason"></span>
+				<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0">
+				<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 			</td>
 			<td colspan="1" class="text-center">
-				<a class="btn btn-sm btn-default" ng-if="active=='end'" ng-click="reapply(request.id)">再次申请</span>
+				<a ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>供应商 </a>
+				<a ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>客户</a>
+				<a ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a>
+				<a ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a>
 			</td>
 		</tr>
 	</tbody>

src/main/webapp/resources/tpl/index/home/left.html

@@ -49,6 +49,7 @@
 		常用操作<i></i>
 	</div>
 	<ul class="list-unstyled">
+		<li><a href="#/baseInfo/enterpriseList" ><strong>企业圈</strong></a></li>
 		<li><a href="#/sale/order">客户采购订单</a></li>
 		<li><a href="#/sale/notice">客户送货提醒</a></li>
 		<li><a href="#/sale/accept">客户验收单</a></li>