企业圈搜索结果显示修改

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

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

@@ -185,7 +185,7 @@ public class AddPartnerController {
 	}
 
 	/**
-	 * 添加为供应商
+	 * 添加为服务商
 	 *
 	 * @param businessCode
 	 * @return

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

@@ -20,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 @Service
 public class AddPartnerServiceImpl implements AddPartnerService {
@@ -139,10 +142,13 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 			map.put("error","未查找到对应企业，请确认信息是否正确");
 			return map;
 		}
-		// 先判断是否为供应商
+		// 先判断是否为供应商(因为添加了服务商概念，所以可能有存在记录但未添加的状况)
 		List<Vendor> oldVendor = vendorDao.findByMyEnUUAndVendUU(myEnter.getUu(), vendEnter.getUu());
 		if (!CollectionUtils.isEmpty(oldVendor)) {
-			map.put("error", "该企业已经是您的供应商，请不要重复添加");
+			Vendor vendor = oldVendor.get(0);
+			vendor.setVendswitch(Constant.YES);
+			vendorDao.save(vendor);
+			map.put("success", "添加供应商成功");
 		} else {
 			Vendor vendor = new Vendor();
 			UserBaseInfo vendUser = userBaseInfoDao.findByUserUU(myEnter.getEnAdminuu());
@@ -173,10 +179,13 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 			map.put("error","未查找到对应企业，请确认信息是否正确");
 			return map;
 		}
-		// 先判断是否为供应商
+		// 先判断是否存在供应商关系记录
 		List<Vendor> oldVendor = vendorDao.findByMyEnUUAndVendUU(myEnter.getUu(), vendEnter.getUu());
 		if (!CollectionUtils.isEmpty(oldVendor)) {
-			map.put("error", "该企业已经是您的服务商，请不要重复添加");
+			Vendor vendor = oldVendor.get(0);
+			vendor.setServicerswitch(Constant.YES);
+			vendorDao.save(vendor);
+			map.put("success", "添加服务商成功");
 		} else {
 			Vendor vendor = new Vendor();
 			UserBaseInfo vendUser = userBaseInfoDao.findByUserUU(myEnter.getEnAdminuu());
@@ -405,7 +414,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 		Page<PartnershipRecord> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
 				pageSize);
 		SPage<BasePartnersInfo> partnerRecords = new SPage<BasePartnersInfo>();
-		List<PartnershipRecord> records = pageRecords.getContent();
+		List<PartnershipRecord> records = pageRecords != null ? pageRecords.getContent() : null;
 		List<BasePartnersInfo> baseInfos = new ArrayList<BasePartnersInfo>();
 		if (!CollectionUtils.isEmpty(records)) {
 			for (PartnershipRecord record : records) {
@@ -437,14 +446,17 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					// 供应商
 					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getVendUID());
 					if (!CollectionUtils.isEmpty(vendor)) {
-						partner.setVendor(Constant.YES);
+						// 开关为null时，表示未添加，为0表示关闭，为1表示开启
+						partner.setVendor((short) (vendor.get(0).getVendswitch() == null ? 0 : 1));
 						partner.setVendorId(vendor.get(0).getId());
 						partner.setVendswitch(vendor.get(0).getVendswitch());
-						partner.setEnterprise(vendor.get(0).getMyEnterprise());
+						partner.setEnterprise(vendor.get(0).getVendorEnterprise());
 						partner.setContact(vendor.get(0).getMyUser());
+						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
 						partner.setServicerswitch(vendor.get(0).getServicerswitch());
 					} else {
 						partner.setVendor(Constant.NO);
+						partner.setServicer(Constant.NO);
 					}
 					// 客户
 					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), businessCode);
@@ -452,7 +464,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
-						partner.setEnterprise(customer.get(0).getVendorEnterprise());
+						partner.setEnterprise(customer.get(0).getMyEnterprise());
 						partner.setContact(customer.get(0).getVendorUser());
 					} else {
 						partner.setCustomer(Constant.NO);
@@ -493,11 +505,12 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					// 供应商
 					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getCustUID());
 					if (!CollectionUtils.isEmpty(vendor)) {
-						partner.setVendor(Constant.YES);
+						partner.setVendor((short) (vendor.get(0).getVendswitch() == null ? 0 : 1));
 						partner.setVendorId(vendor.get(0).getId());
 						partner.setVendswitch(vendor.get(0).getVendswitch());
 						partner.setServicerswitch(vendor.get(0).getServicerswitch());
-						partner.setEnterprise(vendor.get(0).getMyEnterprise());
+						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
+						partner.setEnterprise(vendor.get(0).getVendorEnterprise());
 						partner.setContact(vendor.get(0).getMyUser());
 					} else {
 						partner.setVendor(Constant.NO);
@@ -508,7 +521,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
-						partner.setEnterprise(customer.get(0).getVendorEnterprise());
+						partner.setEnterprise(customer.get(0).getMyEnterprise());
 						partner.setContact(customer.get(0).getMyUser());
 					} else {
 						partner.setCustomer(Constant.NO);
@@ -526,7 +539,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 			}
 		}
 		partnerRecords.setContent(baseInfos);
-		partnerRecords.setTotalElement(pageRecords.getTotalElements());
+		partnerRecords.setTotalElement(pageRecords != null ? pageRecords.getTotalElements() : 0);
 		return partnerRecords;
 	}
 

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

@@ -690,7 +690,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 						}
 					}
 				}
-				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(order.getVendUU(), order.getEnUU());
+				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(order.getEnUU(), order.getVendUU());
 				// 查找有权限的用户
 				if (!CollectionUtils.isEmpty(vendors)) {
 					Long vendorId = vendors.get(0).getId();

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

@@ -367,19 +367,19 @@
 		<tr class="height72 order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 			<td class="first" colspan="4">
 				<div class="row">
-					<div class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::request.vendUID"></span></div>
-					<div class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::request.enterprise.enCorporation"></span></div>
-					<div class="col-md-4"><span class="text-muted">企业UU：</span><span ng-bind="::request.enterprise.uu"></span></div>
+					<div ng-if="::request.vendUID" class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::request.vendUID"></span></div>
+					<div ng-if="::request.enterprise.enCorporation" class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::request.enterprise.enCorporation"></span></div>
+					<div ng-if="::request.enterprise.uu" class="col-md-4"><span class="text-muted">企业UU：</span><span ng-bind="::request.enterprise.uu"></span></div>
 				</div>
 				<div class="row">
-					<div class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::request.contact.userName"></span></div>
-					<div class="col-md-3"><span class="text-muted">联系电话：</span><span ng-bind="::request.contact.userTel"></span></div>
-					<div class="col-md-4"><span class="text-muted">邮箱：</span><span ng-bind="::request.contact.userEmail"></span></div>
+					<div ng-if="::request.contact.userName" class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::request.contact.userName"></span></div>
+					<div ng-if="::request.contact.userTel" class="col-md-3"><span class="text-muted">联系电话：</span><span ng-bind="::request.contact.userTel"></span></div>
+					<div ng-if="::request.contact.userEmail" class="col-md-4"><span class="text-muted">邮箱：</span><span ng-bind="::request.contact.userEmail"></span></div>
 				</div>
-				<div class="row col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::request.enterprise.enAddress"></span></div>
+				<div ng-if="::request.enterprise.enAddress" class="row col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::request.enterprise.enAddress"></span></div>
 			</td>
 			<td>
-				<p ng-if="request.statusCode==313 && request.vendor == 0"><a class="btn label-success white" ng-click="addSupplier(request.vendUID)">添加供应商 </a></p>
+				<p ng-if="request.statusCode==313 && request.vendor != 1"><a class="btn label-success white" ng-click="addSupplier(request.vendUID)">添加供应商 </a></p>
 				<p class="switch"  ng-if="request.statusCode==313 && request.vendor == 1">
 					<span style="float: left;">供应商</span>
 					<span class="checkbox">
@@ -387,15 +387,15 @@
 						<span class=""  ng-if="request.vendor == 1 && request.vendswitch != 1" ng-click="activeVend(request.vendorId)" title="已禁用"></span>
 					</span>
 				</p>
-			<p ng-if="request.statusCode==313 && request.vendor == 0"><a class="line24 btn label-success white" ng-click="addServicer(request.vendUID)">添加服务商</a></p>
-			<p class="switch"  ng-if="request.statusCode==313 && request.vendor == 1">
+			<p ng-if="request.statusCode==313 && request.servicer != 1"><a class="line24 btn label-success white" ng-click="addServicer(request.vendUID)">添加服务商</a></p>
+			<p class="switch"  ng-if="request.statusCode==313 && request.servicer == 1">
 				<span style="float: left;">服务商</span>
 				<span class="checkbox">
-						<span class="off" ng-if="request.vendor == 1 && request.servicerswitch == 1" ng-click="relieveServicer(request.vendorId)" title="已启用"></span>
-						<span class=""  ng-if="request.vendor == 1 && request.servicerswitch != 1" ng-click="activeServicer(request.vendorId)" title="已禁用"></span>
+						<span class="off" ng-if="request.servicer == 1 && request.servicerswitch == 1" ng-click="relieveServicer(request.vendorId)" title="已启用"></span>
+						<span class=""  ng-if="request.servicer == 1 && request.servicerswitch != 1" ng-click="activeServicer(request.vendorId)" title="已禁用"></span>
 					</span>
 			</p>
-				<p ng-if="request.statusCode==313 && request.customer == 0"><a class="line24 btn label-danger white" ng-click="addCust(request.vendUID)">添加客户</a></p>
+				<p ng-if="request.statusCode==313 && request.customer != 1"><a class="line24 btn label-danger white" ng-click="addCust(request.vendUID)">添加客户</a></p>
 				<p class="switch"  ng-if="request.statusCode==313 && request.customer == 1">
 					<span style="float: left;">客户</span>
 					<span class="checkbox">

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

@@ -365,20 +365,20 @@
         <tr class="height72 order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
             <td class="first" colspan="4">
                 <div class="row">
-                    <div class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::request.vendUID"></span></div>
-                    <div class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::request.enterprise.enCorporation"></span></div>
-                    <div class="col-md-4"><span class="text-muted">企业UU：</span><span ng-bind="::request.enterprise.uu"></span></div>
+                    <div ng-if="::request.vendUID" class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::request.vendUID"></span></div>
+                    <div ng-if="::request.enterprise.enCorporation" class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::request.enterprise.enCorporation"></span></div>
+                    <div ng-if="::request.enterprise.uu" class="col-md-4"><span class="text-muted">企业UU：</span><span ng-bind="::request.enterprise.uu"></span></div>
                 </div>
                 <span class="text-icon" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
                 <span class="text-icon" ng-if="request.statusCode==310 && request.method==1">未通过</span>
                 <span class="text-icon" ng-if="request.statusCode==313 && request.method == 0">已同意</span>
                 <span class="text-icon" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
                 <div class="row">
-                    <div class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::request.contact.userName"></span></div>
-                    <div class="col-md-3"><span class="text-muted">联系电话：</span><span ng-bind="::request.contact.userTel"></span></div>
-                    <div class="col-md-4"><span class="text-muted">邮箱：</span><span ng-bind="::request.contact.userEmail"></span></div>
+                    <div ng-if="::request.contact.userName" class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::request.contact.userName"></span></div>
+                    <div ng-if="::request.contact.userTel" class="col-md-3"><span class="text-muted">联系电话：</span><span ng-bind="::request.contact.userTel"></span></div>
+                    <div ng-if="::request.contact.userEmail" class="col-md-4"><span class="text-muted">邮箱：</span><span ng-bind="::request.contact.userEmail"></span></div>
                 </div>
-                <div class="row col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::request.enterprise.enAddress"></span></div>
+                <div ng-if="::request.enterprise.enAddress" class="row col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::request.enterprise.enAddress"></span></div>
             </td>
             <td width="140" class="text-center">
               <p ng-if="request.statusCode==313 && request.vendor == 0"><a class="btn label-success white" ng-click="addSupplier(request.vendUID)">添加供应商 </a></p>
@@ -389,12 +389,12 @@
                             <span class=""  ng-if="request.vendor == 1 && request.vendswitch != 1" ng-click="activeVend(request.vendorId)" title="已禁用"></span>
                         </span>
                 </p>
-                <p ng-if="request.statusCode==313 && request.vendor == 0"><a class="line24 btn label-success white" ng-click="addServicer(request.vendUID)">添加服务商</a></p>
-                <p class="switch"  ng-if="request.statusCode==313 && request.vendor == 1">
+                <p ng-if="request.statusCode==313 && request.servicer != 1"><a class="line24 btn label-success white" ng-click="addServicer(request.vendUID)">添加服务商</a></p>
+                <p class="switch"  ng-if="request.statusCode==313 && request.servicer == 1">
                     <span style="float: left;">服务商</span>
                     <span class="checkbox">
-                            <span class="off" ng-if="request.vendor == 1 && request.servicerswitch == 1" ng-click="relieveServicer(request.vendorId)" title="已启用"></span>
-                            <span class=""  ng-if="request.vendor == 1 && (request.servicerswitch != 1)" ng-click="activeServicer(request.vendorId)" title="已禁用"></span>
+                            <span class="off" ng-if="request.servicer == 1 && request.servicerswitch == 1" ng-click="relieveServicer(request.vendorId)" title="已启用"></span>
+                            <span class=""  ng-if="request.servicer == 1 && (request.servicerswitch != 1)" ng-click="activeServicer(request.vendorId)" title="已禁用"></span>
                         </span>
                 </p>
                 <p ng-if="request.statusCode==313 && request.customer == 0"><a class="line24 btn label-danger white" ng-click="addCust(request.vendUID)">添加客户</a></p>

src/main/webapp/resources/tpl/index/search/search_result.html

@@ -263,7 +263,7 @@
 					<span  ng-bind-html="enterprise.name| getkey:tip"></span>
 					<img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313">
 				</td>
-				<td width="200" class="text-center"></span>
+				<td width="200" class="text-center">
 				</td>
 				<td width="220" class="text-center text-muted" ng-if="enterprise.status == 313">
 					<span ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">当前企业还不是您的合作伙伴</span>
@@ -276,10 +276,19 @@
 				</td>
 			</tr>
 			<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
-				<td class="product" colspan=3>
-					<div class="f14" >企业地址：<span ng-bind="::enterprise.address" class="f14"></span></div>
-					<!-- <div class="" >联系人：<span ng-bind-html="enterprise.adminName| getkey:tip"></span>&nbsp;
-						电话：<span ng-bind="::enterprise.adminTel"></span></div> -->
+				<td class="product" colspan="3">
+					<div class="row">
+						<span class="col-md-4"><span class="text-muted">营业执照：</span><span ng-bind="::enterprise.businessCode" ></span></span>
+						<span class="col-md-4" ng-if="::enterprise.industry != null"><span class="text-muted">企业类型：</span><span class="text-muted" ng-bind="::enterprise.industry == 'make'?'制造型':'贸易型'"></span></span>
+					</div>
+					<div class="row">
+						<span  ng-if="::enterprise.adminName != null" class="col-md-3"><span class="text-muted">管理员：</span><span ng-bind-html="::enterprise.adminName| getkey:keyword"></span></span>
+						<span ng-if="::enterprise.adminTel != null" class="col-md-3"><span class="text-muted">电话：</span>{{::enterprise.adminTel}}</span>
+						<span ng-if="::enterprise.adminEmail != null" class="col-md-5"><span class="text-muted">邮箱：</span>{{::enterprise.adminEmail}}</span>
+					</div>
+					<div class="row" ng-if="::enterprise.address != null">
+						<span class="col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::enterprise.address"></span></span>
+					</div>
 				</td>
 				<td class="text-center ">