已通过的申请判断是否已是供应商或客户，给出提示

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

src/main/java/com/uas/platform/b2b/dao/VendorDao.java

@@ -27,6 +27,18 @@ public interface VendorDao extends JpaSpecificationExecutor<Vendor>, GenericRepo
 	@Query("from Vendor v where v.myEnUU = :myEnUU and v.vendorEnterprise.uu = :vendUU")
 	public List<Vendor> findByMyEnUUAndVendUU(@Param("myEnUU") long myEnUU, @Param("vendUU") long vendUU);
 
+	/**
+	 * 按营业执照号查询供应商或客户是否存在
+	 * 
+	 * @param myEnBusinessCode
+	 * @param VendBusinessCode
+	 * @return
+	 */
+	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
+	@Query("from Vendor v where v.myEnterprise.enBussinessCode = :myEnBusinessCode and v.vendorEnterprise.enBussinessCode = :VendBusinessCode")
+	public List<Vendor> findByMyEnBusinessCodeAndVendBusinessCode(@Param("myEnBusinessCode") String myEnBusinessCode,
+			@Param("VendBusinessCode") String VendBusinessCode);
+
 	public List<Vendor> findByMyEnUU(Long myEnUU);
 
 	public List<Vendor> findByVendEnUU(Long vendUU);

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

@@ -197,6 +197,8 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 		if (!CollectionUtils.isEmpty(records)) {
 			for (PartnershipRecord record : records) {
 				BasePartnersInfo partner = new BasePartnersInfo();
+				List<Vendor> vendor = new ArrayList<Vendor>();
+				List<Vendor> customer = new ArrayList<Vendor>();
 				// cust为当前企业,发出申请
 				if (record.getCustUID().equals(businessCode)) {
 					partner.setRequestDate(record.getRequestDate());
@@ -213,6 +215,20 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setCustUserName(record.getCustUserName());
 					partner.setCustUserTel(record.getCustUserTel());
 					partner.setReason(record.getReason());
+					// 供应商
+					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getVendUID());
+					if (!CollectionUtils.isEmpty(vendor)) {
+						partner.setVendor(Constant.YES);
+					} else {
+						partner.setVendor(Constant.NO);
+					}
+					// 客户
+					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), businessCode);
+					if (!CollectionUtils.isEmpty(customer)) {
+						partner.setCustomer(Constant.YES);
+					} else {
+						partner.setCustomer(Constant.NO);
+					}
 					baseInfos.add(partner);
 				}
 				// vend为当前企业,收到申请
@@ -231,6 +247,20 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setCustUserName(record.getCustUserName());
 					partner.setCustUserTel(record.getCustUserTel());
 					partner.setReason(record.getReason());
+					// 供应商
+					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getVendUID());
+					if (!CollectionUtils.isEmpty(vendor)) {
+						partner.setVendor(Constant.YES);
+					} else {
+						partner.setVendor(Constant.NO);
+					}
+					// 客户
+					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), businessCode);
+					if (!CollectionUtils.isEmpty(customer)) {
+						partner.setCustomer(Constant.YES);
+					} else {
+						partner.setCustomer(Constant.NO);
+					}
 					baseInfos.add(partner);
 				}
 			}

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

@@ -94,6 +94,16 @@ public class BasePartnersInfo implements Serializable {
 	 */
 	private String reason;
 
+	/**
+	 * 是否是供应商
+	 */
+	private Short vendor;
+
+	/**
+	 * 是否是客户
+	 */
+	private Short customer;
+
 	public Long getId() {
 		return id;
 	}
@@ -210,6 +220,22 @@ public class BasePartnersInfo implements Serializable {
 		return reason;
 	}
 
+	public Short getVendor() {
+		return vendor;
+	}
+
+	public void setVendor(Short vendor) {
+		this.vendor = vendor;
+	}
+
+	public Short getCustomer() {
+		return customer;
+	}
+
+	public void setCustomer(Short customer) {
+		this.customer = customer;
+	}
+
 	public void setReason(String reason) {
 		this.reason = reason;
 	}

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

@@ -355,13 +355,15 @@
 					<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 				</div>
 			<td width="200" class="text-center">
-				<p><a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313">添加供应商 </a></p>
-				<p><a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313">添加客户</a></p>
+				<p><a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313 && request.vendor == 0">添加供应商 </a></p>
+				<p><span class="btn01 btn label-danger white" ng-if="request.statusCode==313 && request.vendor == 1">供应商 </span></p>
+				<p><span class="btn01 btn label-danger white" ng-if="request.statusCode==313 && request.vendor == 1">客户</span></p>
+				<p><a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313 && request.vendor == 0">添加客户</a></p>
 				<p><a  class="btn label-success white" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a></p>
 				<p><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a></p>
 				<span class="btn01 btn label-info white" ng-if="request.statusCode==311 && request.method==1">等待处理</span>
 				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
-				<span class="btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
+				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
 			</td>
 		</tr>
 	</tbody>