Browse Source

属性值属性调整

wangyc 7 years ago
parent
commit
1418602c3e

+ 7 - 2
src/main/java/com/uas/platform/b2b/model/SaleSend.java

@@ -1,6 +1,10 @@
 package com.uas.platform.b2b.model;
 
+import static com.alibaba.druid.sql.ast.expr.SQLUnaryOperator.Not;
+import static org.springframework.data.jpa.domain.AbstractPersistable_.id;
+
 import com.alibaba.fastjson.annotation.JSONField;
+import javax.validation.constraints.NotNull;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.CollectionUtils;
 
@@ -16,7 +20,7 @@ import java.util.Set;
  * @author yingp
  * 
  */
-@Table(name = "sale$send")
+@Table(name = "sale$send", indexes = {@Index(name = "index_salesend_back", columnList = "ss_backstatus"), @Index(name = "index_salesend_send", columnList = "ss_sendstatus")})
 @Entity
 public class SaleSend implements Serializable {
 
@@ -148,7 +152,8 @@ public class SaleSend implements Serializable {
 	/**
 	 * 每次产生送货单时记录一个唯一标识,防止重复
 	 */
-	@Column(name = "ss_uuid")
+	@Column(name = "ss_uuid", unique = true)
+	@NotNull
 	private String uuid;
 
 	public SaleSend() {

+ 9 - 5
src/main/java/com/uas/platform/b2b/model/UserOrders.java

@@ -1,16 +1,14 @@
 package com.uas.platform.b2b.model;
 
+import com.uas.platform.core.model.Status;
 import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-
-import com.uas.platform.core.model.Status;
+import javax.validation.constraints.NotNull;
 
 /**
  * 记录客户单据的未读状态
@@ -28,38 +26,44 @@ public class UserOrders {
     /**
      * 客户UU号
      */
+    @NotNull
     @Column(name = "puo_useruu")
     private Long userUU;
 
     /**
      * 客户企业UU号
      */
+    @NotNull
     @Column(name = "puo_enuu")
     private Long enUU;
 
     /**
      * 单据id(用于查询单据属性)
      */
+    @NotNull
     @Column(name = "puo_sourceid")
     private Long sourceId;
 
     /**
      * 单据分类(purc or sale)
      */
+    @NotNull
     @Column(name = "puo_category")
     private String category;
 
     /**
      * 单据表名(用于区分单据)、
      */
+    @NotNull
     @Column(name = "puo_table")
     private String table;
 
     /**
      * 阅读状态(201表示已读, 200表示未读)
      */
+    @NotNull
     @Column(name = "puo_readstatus")
-    private Short readStatus;
+    private Short readStatus = (short) Status.NOT_READ.value();
 
     /**
      * 单据阅读时间(用于定期删除)

+ 5 - 3
src/main/java/com/uas/platform/b2b/model/Vendor.java

@@ -9,6 +9,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
@@ -16,6 +17,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
+import javax.validation.constraints.NotNull;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -27,7 +29,7 @@ import com.uas.platform.core.persistence.StatusColumn;
 import com.uas.platform.core.persistence.UserUU;
 
 @Entity
-@Table(name = "purc$vendors")
+@Table(name = "purc$vendors", indexes = {@Index(name = "index_vendor_status", columnList = "ve_status"), @Index(name = "index_vendor_myen_venden", columnList = "ve_myenuu, ve_vendenuu", unique = true)})
 @Logger(enUU = "ve_myenuu", userUU = "ve_myuseruu")
 @Cacheable
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2b.model.Vendor")
@@ -60,7 +62,7 @@ public class Vendor implements Serializable {
 	 * 我的企业
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	@JoinColumn(name = "ve_myenuu", insertable = false, updatable = false)
+	@JoinColumn(name = "ve_myenuu", insertable = false, updatable = false, nullable = false)
 	private Enterprise myEnterprise;
 
 	/**
@@ -84,7 +86,7 @@ public class Vendor implements Serializable {
 	 * 供应商的企业UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	@JoinColumn(name = "ve_vendenuu", insertable = false, updatable = false)
+	@JoinColumn(name = "ve_vendenuu", insertable = false, updatable = false, nullable = false)
 	private Enterprise vendorEnterprise;
 
 	@Column(name = "ve_venduseruu")

+ 5 - 0
src/main/java/com/uas/platform/b2b/model/VendorPerformanceAssess.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.model;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
+import javax.validation.constraints.NotNull;
 
 /**
  * 供应商绩效考核
@@ -25,6 +26,7 @@ public class VendorPerformanceAssess implements Serializable {
      * 采购员号
      */
     @Column(name = "enuu")
+    @NotNull
     private Long enUU;
 
     /**
@@ -35,9 +37,11 @@ public class VendorPerformanceAssess implements Serializable {
     private EnterpriseInfo enterprise;
 
     @Column(name = "vpa_id")
+    @NotNull
     private Long vpaId;
 
     @Column(name = "vpa_code")
+    @NotNull
     private String vpaCode;
 
     @Column(name = "vpa_status")
@@ -212,6 +216,7 @@ public class VendorPerformanceAssess implements Serializable {
      * 供应商号
      */
     @Column(name = "vpa_veuu")
+    @NotNull
     private Long vpaVeuu;
 
     public Long getId() {