From 4363e820c2ac952e86ab9a9318b530b9654124aa Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Mon, 26 Dec 2022 18:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=90=88=E5=90=8C=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/model/process/SupplierMaterial.java       | 14 ++++++++++++--
 .../palmte/work/service/ProjectProcessService.java |  3 ---
 2 files changed, 12 insertions(+), 5 deletions(-)

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;