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

src/main/java/com/uas/platform/b2b/erp/model/ErpLog.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,7 +17,6 @@ import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.annotations.Index;
 
 import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.User;
@@ -30,7 +30,7 @@ import com.uas.platform.core.logging.BufferedLogable;
  * 
  */
 @Entity
-@Table(name = "log$erp")
+@Table(name = "log$erp", indexes = { @Index(name = "log$erp_enuu_idx", columnList = "log_enuu") })
 public class ErpLog extends BufferedLogable implements Serializable {
 
 	/**
@@ -45,7 +45,6 @@ public class ErpLog extends BufferedLogable implements Serializable {
 	private Long id;
 
 	@Column(name = "log_enuu")
-	@Index(name = "log$erp_enuu_idx")
 	private Long enUU;
 
 	@OneToOne(cascade = { CascadeType.REFRESH })

src/main/java/com/uas/platform/b2b/model/CustSaleStatMonth.java

@@ -4,20 +4,19 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 客户采购额统计（月）
  * 
  * @author yingp
- *
+ * 
  */
 @Entity
-@Table(name = "sale$stat$month$cust")
+@Table(name = "sale$stat$month$cust", indexes = { @Index(name = "sale$stat$m$c_enuu_idx", columnList = "ss_enuu") })
 public class CustSaleStatMonth {
 
 	@Id
@@ -28,7 +27,6 @@ public class CustSaleStatMonth {
 	 * 企业UU
 	 */
 	@Column(name = "ss_enuu")
-	@Index(name = "sale$stat$m$c_enuu_idx")
 	private Long enUU;
 
 	/**

src/main/java/com/uas/platform/b2b/model/CustSaleStatYear.java

@@ -4,12 +4,11 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 客户采购额统计（年）
  * 
@@ -17,7 +16,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "sale$stat$year$cust")
+@Table(name = "sale$stat$year$cust", indexes = { @Index(name = "sale$stat$y$c_enuu_idx", columnList = "ss_enuu") })
 public class CustSaleStatYear {
 
 	@Id
@@ -28,7 +27,6 @@ public class CustSaleStatYear {
 	 * 企业UU
 	 */
 	@Column(name = "ss_enuu")
-	@Index(name = "sale$stat$y$c_enuu_idx")
 	private Long enUU;
 
 	/**

src/main/java/com/uas/platform/b2b/model/Growth.java

@@ -5,11 +5,10 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 企业成长点
  * 
@@ -17,7 +16,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "log$growth")
+@Table(name = "log$growth", indexes = { @Index(name = "log$growth_enuu_idx", columnList = "grow_enuu") })
 public class Growth {
 
 	@Id
@@ -30,7 +29,6 @@ public class Growth {
 	 * 企业UU
 	 */
 	@Column(name = "grow_enuu")
-	@Index(name = "log$growth_enuu_idx")
 	private Long enUU;
 
 	/**

src/main/java/com/uas/platform/b2b/model/GrowthProcess.java

@@ -7,11 +7,10 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 企业成长历程
  * 
@@ -19,7 +18,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "log$growthprocess")
+@Table(name = "log$growthprocess", indexes = { @Index(name = "log$growthprocess_enuu_idx", columnList = "process_enuu") })
 public class GrowthProcess {
 
 	@Id
@@ -32,7 +31,6 @@ public class GrowthProcess {
 	 * 企业UU
 	 */
 	@Column(name = "process_enuu")
-	@Index(name = "log$growthprocess_enuu_idx")
 	private Long enUU;
 
 	/**

src/main/java/com/uas/platform/b2b/model/SaleStatDay.java

@@ -3,10 +3,9 @@ package com.uas.platform.b2b.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 销售额统计（日）
  * 
@@ -14,7 +13,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "sale$stat$day")
+@Table(name = "sale$stat$day", indexes = { @Index(name = "sale$stat$day_enuu_idx", columnList = "ss_enuu") })
 public class SaleStatDay {
 
 	@Id
@@ -25,7 +24,6 @@ public class SaleStatDay {
 	 * 企业UU
 	 */
 	@Column(name = "ss_enuu")
-	@Index(name = "sale$stat$day_enuu_idx")
 	private Long enUU;
 
 	@Column(name = "ss_year")

src/main/java/com/uas/platform/b2b/model/SaleStatMonth.java

@@ -3,10 +3,9 @@ package com.uas.platform.b2b.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 销售额统计（月）
  * 
@@ -14,7 +13,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "sale$stat$month")
+@Table(name = "sale$stat$month", indexes = { @Index(name = "sale$stat$day_enuu_idx", columnList = "ss_enuu") })
 public class SaleStatMonth {
 
 	@Id
@@ -25,7 +24,6 @@ public class SaleStatMonth {
 	 * 企业UU
 	 */
 	@Column(name = "ss_enuu")
-	@Index(name = "sale$stat$day_enuu_idx")
 	private Long enUU;
 
 	@Column(name = "ss_year")

src/main/java/com/uas/platform/b2b/model/SaleStatYear.java

@@ -3,10 +3,9 @@ package com.uas.platform.b2b.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 销售额统计（年）
  * 
@@ -14,7 +13,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "sale$stat$year")
+@Table(name = "sale$stat$year", indexes = { @Index(name = "sale$stat$day_enuu_idx", columnList = "ss_enuu") })
 public class SaleStatYear {
 
 	@Id
@@ -25,7 +24,6 @@ public class SaleStatYear {
 	 * 企业UU
 	 */
 	@Column(name = "ss_enuu")
-	@Index(name = "sale$stat$day_enuu_idx")
 	private Long enUU;
 
 	@Column(name = "ss_year")

src/main/java/com/uas/platform/b2b/model/SellerSaleStatMonth.java

@@ -4,12 +4,11 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 业务员销售额统计（月）
  * 
@@ -17,7 +16,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "sale$stat$month$seller")
+@Table(name = "sale$stat$month$seller", indexes = { @Index(name = "sale$stat$m$s_enuu_idx", columnList = "ss_enuu") })
 public class SellerSaleStatMonth {
 
 	@Id
@@ -28,7 +27,6 @@ public class SellerSaleStatMonth {
 	 * 企业UU
 	 */
 	@Column(name = "ss_enuu")
-	@Index(name = "sale$stat$m$s_enuu_idx")
 	private Long enUU;
 
 	/**

src/main/java/com/uas/platform/b2b/model/SellerSaleStatYear.java

@@ -4,12 +4,11 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Index;
-
 /**
  * 业务员销售额统计（年）
  * 
@@ -17,7 +16,7 @@ import org.hibernate.annotations.Index;
  *
  */
 @Entity
-@Table(name = "sale$stat$year$seller")
+@Table(name = "sale$stat$year$seller", indexes = { @Index(name = "sale$stat$y$s_enuu_idx", columnList = "ss_enuu") })
 public class SellerSaleStatYear {
 
 	@Id
@@ -28,7 +27,6 @@ public class SellerSaleStatYear {
 	 * 企业UU
 	 */
 	@Column(name = "ss_enuu")
-	@Index(name = "sale$stat$y$s_enuu_idx")
 	private Long enUU;
 
 	/**

src/main/java/com/uas/platform/b2b/model/UsageLog.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,7 +17,6 @@ import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.annotations.Index;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.DateFormatUtils;
@@ -30,7 +30,7 @@ import com.uas.platform.core.logging.BufferedLogable;
  * 
  */
 @Entity
-@Table(name = "log$usage")
+@Table(name = "log$usage", indexes = { @Index(name = "log$usage_enuu_idx", columnList = "log_enuu") })
 public class UsageLog extends BufferedLogable implements Serializable {
 
 	/**
@@ -45,7 +45,6 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	private Long id;
 
 	@Column(name = "log_enuu")
-	@Index(name = "log$usage_enuu_idx")
 	private Long enUU;
 
 	@OneToOne(cascade = { CascadeType.REFRESH })