hejq 8 лет назад
Родитель
Сommit
55629ff7fb
36 измененных файлов с 72 добавлено и 410 удалено
  1. 3 5
      src/main/java/com/uas/platform/b2b/dao/AddPartnerDao.java
  2. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/AdvancedSettings.java
  3. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/AppFlowOperation.java
  4. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/BulletinCenter.java
  5. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/ClockAddress.java
  6. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/ClockSetCenter.java
  7. 1 12
      src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java
  8. 3 13
      src/main/java/com/uas/platform/b2b/mobile/model/FeePleaseDetail.java
  9. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/MobileAuditLog.java
  10. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/NewsCenter.java
  11. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/NoticeCenter.java
  12. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/OutAddress.java
  13. 1 12
      src/main/java/com/uas/platform/b2b/mobile/model/OutPlan.java
  14. 4 14
      src/main/java/com/uas/platform/b2b/mobile/model/OutPlanDetail.java
  15. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/OutSet.java
  16. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/OutSign.java
  17. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/SignApp.java
  18. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/SignCard.java
  19. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/SignCardLog.java
  20. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/UserCenter.java
  21. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/Vacation.java
  22. 3 10
      src/main/java/com/uas/platform/b2b/mobile/model/VisitRecord.java
  23. 3 10
      src/main/java/com/uas/platform/b2b/mobile/model/WorkDaily.java
  24. 1 8
      src/main/java/com/uas/platform/b2b/mobile/model/WorkData.java
  25. 1 12
      src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertime.java
  26. 4 14
      src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertimeDet.java
  27. 1 24
      src/main/java/com/uas/platform/b2b/model/DeputyEnterprise.java
  28. 10 21
      src/main/java/com/uas/platform/b2b/model/FlowNode.java
  29. 1 28
      src/main/java/com/uas/platform/b2b/model/MakeOrder.java
  30. 4 18
      src/main/java/com/uas/platform/b2b/model/MakeOrderChange.java
  31. 4 16
      src/main/java/com/uas/platform/b2b/model/MakeOrderItem.java
  32. 4 16
      src/main/java/com/uas/platform/b2b/model/MakeOrderReply.java
  33. 1 12
      src/main/java/com/uas/platform/b2b/model/MakeReturn.java
  34. 3 19
      src/main/java/com/uas/platform/b2b/model/MakeReturnItem.java
  35. 1 8
      src/main/java/com/uas/platform/b2b/model/Message.java
  36. 3 10
      src/main/java/com/uas/platform/b2b/model/OfficeTask.java

+ 3 - 5
src/main/java/com/uas/platform/b2b/dao/AddPartnerDao.java

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.AddPartner;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.AddPartner;
+import java.util.List;
 
 @Repository
 public interface AddPartnerDao extends JpaRepository<AddPartner, Long>, JpaSpecificationExecutor<AddPartner> {
@@ -46,6 +45,5 @@ public interface AddPartnerDao extends JpaRepository<AddPartner, Long>, JpaSpeci
 	 * @return
 	 */
 	@Query("select count(o) from AddPartner o where o.supplieruu = :supplieruu and o.applyStatuscode = :applyStatuscode")
-	public int getTodoCountBySupplieruuAndApplyStatuscode(@Param("supplieruu") long supplieruu,
-			@Param("applyStatuscode") int applyStatuscode);
+	public int getTodoCountBySupplieruuAndApplyStatuscode(@Param("supplieruu") long supplieruu, @Param("applyStatuscode") int applyStatuscode);
 }

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/AdvancedSettings.java

@@ -1,15 +1,8 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
-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;
-
 /**
  * 高级设置
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/AppFlowOperation.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 对审批流进行操作
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/BulletinCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 公告中心
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/ClockAddress.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 打卡地点设置
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/ClockSetCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 打卡设置中心
  * 

+ 1 - 12
src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java

@@ -1,21 +1,10 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 出差单
  * 

+ 3 - 13
src/main/java/com/uas/platform/b2b/mobile/model/FeePleaseDetail.java

@@ -1,21 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+
 /**
  * 出差明细
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/MobileAuditLog.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 单据操作日志
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/NewsCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 新闻中心
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/NoticeCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 通知中心
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/OutAddress.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 外勤常用地址
  * 

+ 1 - 12
src/main/java/com/uas/platform/b2b/mobile/model/OutPlan.java

@@ -1,21 +1,10 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 外勤设置
  * 

+ 4 - 14
src/main/java/com/uas/platform/b2b/mobile/model/OutPlanDetail.java

@@ -1,22 +1,12 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 外勤详细表
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/OutSet.java

@@ -1,15 +1,8 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
-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;
-
 /**
  * 外勤参数
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/OutSign.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 外勤签到记录表
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/SignApp.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 补卡申诉
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/SignCard.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 打卡记录
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/SignCardLog.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 员工打卡记录
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/UserCenter.java

@@ -1,15 +1,8 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
-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;
-
 /**
  * 用户中心
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/Vacation.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 请假单
  * 

+ 3 - 10
src/main/java/com/uas/platform/b2b/mobile/model/VisitRecord.java

@@ -1,18 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
+import org.hibernate.validator.constraints.Length;
+
+import javax.persistence.*;
 import java.io.Serializable;
 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 org.hibernate.validator.constraints.Length;
-
 /**
  * 拜访记录表
  * 

+ 3 - 10
src/main/java/com/uas/platform/b2b/mobile/model/WorkDaily.java

@@ -1,18 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
+import org.hibernate.validator.constraints.Length;
+
+import javax.persistence.*;
 import java.io.Serializable;
 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 org.hibernate.validator.constraints.Length;
-
 /**
  * 工作日报
  * 

+ 1 - 8
src/main/java/com/uas/platform/b2b/mobile/model/WorkData.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 设置员工班次表
  * 

+ 1 - 12
src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertime.java

@@ -1,21 +1,10 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 加班申请单
  * 

+ 4 - 14
src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertimeDet.java

@@ -1,22 +1,12 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 加班申请详情
  * 

+ 1 - 24
src/main/java/com/uas/platform/b2b/model/DeputyEnterprise.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 代采企业设置
  * 
@@ -46,14 +39,6 @@ public class DeputyEnterprise implements Serializable {
 	@Column(name = "de_deputyenuu")
 	private Long deputyenuu;
 	
-	// /**
-	// * 代采企业
-	// */
-	// @OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	// @JoinColumn(name = "de_deputyenuu", insertable = false, updatable =
-	// false)
-	// private Enterprise deputyEnterprise;
-
 	/**
 	 * 代采企业名称(和上面uu号无关,这个是名称传输,uu号是传到指定的账套)
 	 */
@@ -120,12 +105,4 @@ public class DeputyEnterprise implements Serializable {
 		this.deputyenname = deputyenname;
 	}
 
-	// public Enterprise getDeputyEnterprise() {
-	// return deputyEnterprise;
-	// }
-	//
-	// public void setDeputyEnterprise(Enterprise deputyEnterprise) {
-	// this.deputyEnterprise = deputyEnterprise;
-	// }
-
 }

+ 10 - 21
src/main/java/com/uas/platform/b2b/model/FlowNode.java

@@ -1,21 +1,11 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+
 /**
  * 审核流程节点
  * 
@@ -26,14 +16,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 @Table(name = "office$flownode")
 public class FlowNode implements Serializable {
 
-	public String getEmname() {
-		return emname;
-	}
-
-	public void setEmname(String emname) {
-		this.emname = emname;
-	}
-
 	/**
 	 * 
 	 */
@@ -241,5 +223,12 @@ public class FlowNode implements Serializable {
 		this.appname = appname;
 	}
 
+	public String getEmname() {
+		return emname;
+	}
+
+	public void setEmname(String emname) {
+		this.emname = emname;
+	}
 
 }

+ 1 - 28
src/main/java/com/uas/platform/b2b/model/MakeOrder.java

@@ -1,19 +1,9 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 平台里面,以供应商的角度来查看委外加工单
  * 
@@ -287,15 +277,6 @@ public class MakeOrder implements Serializable {
 		this.factory = factory;
 	}
 
-	// /**
-	// * 委外加工单用料明细
-	// */
-	// @OneToMany(mappedBy = "make", cascade = { CascadeType.REFRESH,
-	// CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch =
-	// FetchType.EAGER)
-	// @OrderBy("number")
-	// private Set<MakeOrderItem> items;
-
 	public Long getId() {
 		return id;
 	}
@@ -535,14 +516,6 @@ public class MakeOrder implements Serializable {
 	public void setEnd(Short end) {
 		this.end = end;
 	}
-	//
-	// public Set<MakeOrderItem> getItems() {
-	// return items;
-	// }
-	//
-	// public void setItems(Set<MakeOrderItem> items) {
-	// this.items = items;
-	// }
 
 	public Float getTaxrate() {
 		return taxrate;

+ 4 - 18
src/main/java/com/uas/platform/b2b/model/MakeOrderChange.java

@@ -1,27 +1,13 @@
 package com.uas.platform.b2b.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
 /**
  * 委外变更单(主表,变更信息在明细表)
  * 

+ 4 - 16
src/main/java/com/uas/platform/b2b/model/MakeOrderItem.java

@@ -1,27 +1,15 @@
 package com.uas.platform.b2b.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
 /**
  * 平台里面,以供应商的角度来查看委外加工单用料明细
  * 

+ 4 - 16
src/main/java/com/uas/platform/b2b/model/MakeOrderReply.java

@@ -1,24 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 

+ 1 - 12
src/main/java/com/uas/platform/b2b/model/MakeReturn.java

@@ -1,21 +1,10 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 买家的委外验退单
  * 

+ 3 - 19
src/main/java/com/uas/platform/b2b/model/MakeReturnItem.java

@@ -1,26 +1,10 @@
 package com.uas.platform.b2b.model;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.*;
 
 /**
  * 买家的委外验退单明细

+ 1 - 8
src/main/java/com/uas/platform/b2b/model/Message.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 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;
-
 /**
  * 平台官方推送给用户的消息
  * 

+ 3 - 10
src/main/java/com/uas/platform/b2b/model/OfficeTask.java

@@ -1,18 +1,11 @@
 package com.uas.platform.b2b.model;
 
+import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
+
+import javax.persistence.*;
 import java.io.Serializable;
 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.b2b.temporary.model.OfficeTaskInfo;
-
 @Entity
 @Table(name = "office$task")
 public class OfficeTask implements Serializable {