mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增业务采购合同流程

master
Harry Yang 2022-12-26 18:08:59 +08:00
parent e2ab988555
commit 4363e820c2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/cn/palmte/work/model/process/SupplierMaterial.java
View File

@ -1,6 +1,11 @@
package cn.palmte.work.model.process; package cn.palmte.work.model.process;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import lombok.Data; import lombok.Data;
@ -11,9 +16,14 @@ import lombok.Data;
*/ */
@Data @Data
@Entity @Entity
@Table(name = "project_process_supplier_material") @Table(name = "procurement_contract_supplier_material")
public class SupplierMaterial { public class SupplierMaterial {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@GenericGenerator(name = "persistenceGenerator", strategy = "increment")
private Integer id;
private String companyName; private String companyName;
private String totalAmount; private String totalAmount;
private String serviceTerms; private String serviceTerms;
@ -21,6 +31,6 @@ public class SupplierMaterial {
private String taxRate; private String taxRate;
private String remark; private String remark;
private ProcessAttachment attachment; private String attachment;
} }

3
src/main/java/cn/palmte/work/service/ProjectProcessService.java
View File

@ -20,10 +20,7 @@ import cn.palmte.work.config.activiti.ActProjectTypeEnum;
import cn.palmte.work.model.Admin; import cn.palmte.work.model.Admin;
import cn.palmte.work.model.Project; import cn.palmte.work.model.Project;
import cn.palmte.work.model.ProjectRepository; 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.ProcessStatus;
import cn.palmte.work.model.enums.ProjectType;
import cn.palmte.work.model.process.ProcurementContract; import cn.palmte.work.model.process.ProcurementContract;
import cn.palmte.work.model.process.ProjectProcess; import cn.palmte.work.model.process.ProjectProcess;
import cn.palmte.work.model.process.SaleContract; import cn.palmte.work.model.process.SaleContract;