Merge remote-tracking branch 'origin/master' into hotfix-youhua-wangmh

sso-server/src/main/java/com/uas/sso/entity/PartnershipRecord.java

@@ -46,14 +46,14 @@ public class PartnershipRecord implements Serializable {
 	/**
 	 * 申请企业uu号
 	 */
-	@Column(name = "cust_space_uu", insertable = false, updatable = false)
+	@Column(name = "cust_space_uu")
 	private Long custSpaceUU;
 
 	/**
 	 * 申请企业
 	 */
 	@ManyToOne
-	@JoinColumn(name = "cust_space_uu")
+	@JoinColumn(name = "cust_space_uu", insertable = false, updatable = false)
 	private Userspace custSpace;
 
 	/**
@@ -102,14 +102,14 @@ public class PartnershipRecord implements Serializable {
 	/**
 	 * 客户的标识（如UU号等）
 	 */
-	@Column(name = "vend_space_uu", insertable = false, updatable = false)
+	@Column(name = "vend_space_uu")
 	private Long vendSpaceUU;
 
 	/**
 	 * 客户的标识（如UU号等）
 	 */
 	@ManyToOne
-	@JoinColumn(name = "vend_space_uu")
+	@JoinColumn(name = "vend_space_uu", insertable = false, updatable = false)
 	private Userspace vendSpace;
 
 	/**
@@ -127,31 +127,32 @@ public class PartnershipRecord implements Serializable {
 	/**
 	 * 审核人标志（uu号等）
 	 */
-	@JoinColumn(name = "vend_user_uu")
+	@Column(name = "vend_user_uu")
 	private Long vendUserCode;
 
 	/**
 	 * 审核人标志（uu号等）
 	 */
-	@JoinColumn(name = "vend_user_uu")
+	@ManyToOne
+	@JoinColumn(name = "vend_user_uu", insertable = false, updatable = false)
 	private User vendUser;
 
 	/**
 	 * 审核人姓名
 	 */
-	@JoinColumn(name = "vend_user_name")
+	@Column(name = "vend_user_name")
 	private String vendUserName;
 
 	/**
 	 * 审核人联系方式
 	 */
-	@JoinColumn(name = "vend_user_Tel")
+	@Column(name = "vend_user_Tel")
 	private String vendUserTel;
 
 	/**
 	 * 审核人邮箱
 	 */
-	@JoinColumn(name = "vend_user_email")
+	@Column(name = "vend_user_email")
 	private String vendUserEmail;
 
 	/**

sso-server/src/main/java/com/uas/sso/service/impl/PartnershipServiceImpl.java

@@ -25,8 +25,7 @@ import javax.persistence.criteria.*;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.google.common.base.Objects.equal;
+import java.util.Optional;
 
 @Service
 public class PartnershipServiceImpl implements PartnershipService {
@@ -336,7 +335,7 @@ public class PartnershipServiceImpl implements PartnershipService {
 			public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				// 添加排序
 				Predicate preStatusCode = cb.equal(root.get("statusCode").as(Short.class), statusCode);
-				query.orderBy(cb.desc(root.get("statusCode")));
+                query.orderBy(cb.desc(root.get("status").as(String.class)), cb.desc(root.get("operateDate").as(Long.class)));
 
 				// 营业执照号为空，则查询所有的
 				if (StringUtils.isEmpty(businessCode)) {
@@ -452,11 +451,12 @@ public class PartnershipServiceImpl implements PartnershipService {
 		}
 
 		// 未申请或拒绝状态，添加一条记录
-		PartnershipRecord newRecord = new PartnershipRecord(record.getAppId(), vendSpace, castSpace);
 		record.setStatusCode(Status.UNAUDIT.getCode());
 		record.setStatus(Status.UNAUDIT.getPhrase());
 		record.setRequestDate(new Timestamp(System.currentTimeMillis()));
 		record.setId(oldSendRecord == null ? oldReceiveRecord == null ? null : oldReceiveRecord.getId() : oldSendRecord.getId());
+        record.setCustSpaceUU(Optional.ofNullable(castSpace).map(Userspace::getSpaceUU).orElse(null));
+        record.setVendSpaceUU(Optional.ofNullable(vendSpace).map(Userspace::getSpaceUU).orElse(null));
 		partnershipRecordDao.save(record);
 		partnershipLog.info(record.getCustSpaceName() + "(" + record.getCustSpaceUU() + ")向" +
 				record.getVendSpaceName() + "(" + record.getVendSpaceUU() + ")发出了建立合作关系的申请");	}
@@ -515,6 +515,7 @@ public class PartnershipServiceImpl implements PartnershipService {
 		record.setStatusCode(Status.ENABLED.getCode());
 		partnershipRecordDao.save(record);
 		map.put("success", "审核成功");
+		map.put("data", record);
 		return map;
 	}