diff --git a/src/main/java/cn/palmte/work/model/process/SupplierMaterial.java b/src/main/java/cn/palmte/work/model/process/SupplierMaterial.java index 6d809de..f0ceb0e 100644 --- a/src/main/java/cn/palmte/work/model/process/SupplierMaterial.java +++ b/src/main/java/cn/palmte/work/model/process/SupplierMaterial.java @@ -1,6 +1,11 @@ package cn.palmte.work.model.process; +import org.hibernate.annotations.GenericGenerator; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; import javax.persistence.Table; import lombok.Data; @@ -11,9 +16,14 @@ import lombok.Data; */ @Data @Entity -@Table(name = "project_process_supplier_material") +@Table(name = "procurement_contract_supplier_material") public class SupplierMaterial { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @GenericGenerator(name = "persistenceGenerator", strategy = "increment") + private Integer id; + private String companyName; private String totalAmount; private String serviceTerms; @@ -21,6 +31,6 @@ public class SupplierMaterial { private String taxRate; private String remark; - private ProcessAttachment attachment; + private String attachment; } diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index 9a75b6b..c0be917 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -20,10 +20,7 @@ import cn.palmte.work.config.activiti.ActProjectTypeEnum; import cn.palmte.work.model.Admin; import cn.palmte.work.model.Project; import cn.palmte.work.model.ProjectRepository; -import cn.palmte.work.model.enums.CooperationType; -import cn.palmte.work.model.enums.Enumerable; import cn.palmte.work.model.enums.ProcessStatus; -import cn.palmte.work.model.enums.ProjectType; import cn.palmte.work.model.process.ProcurementContract; import cn.palmte.work.model.process.ProjectProcess; import cn.palmte.work.model.process.SaleContract;