From 64b5153563ead704a80b90e29db74ce343d13212 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Thu, 22 Dec 2022 10:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/model/enums/ProcessStatus.java | 3 +-- .../palmte/work/model/process/ProcurementContract.java | 10 ++++++++++ .../cn/palmte/work/model/process/ProjectProcess.java | 3 +++ .../cn/palmte/work/model/process/SaleContract.java | 9 +++++++++ .../work/model/process/form/ProcessQueryForm.java | 2 ++ .../model/process/form/SaleContractProcessForm.java | 5 +++++ src/main/resources/sql/2.0.sql | 3 ++- 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java index 6f15fe0..218c94f 100644 --- a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java +++ b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java @@ -11,8 +11,7 @@ public enum ProcessStatus implements Enumerable { draft("草稿"), to_be_audit("待审核"), audit_passed("审核通过"), - audit_not_passed("审核不通过"), - completed("完成"); + audit_not_passed("审核不通过"); private final String description; diff --git a/src/main/java/cn/palmte/work/model/process/ProcurementContract.java b/src/main/java/cn/palmte/work/model/process/ProcurementContract.java index bf72e92..7f157c0 100644 --- a/src/main/java/cn/palmte/work/model/process/ProcurementContract.java +++ b/src/main/java/cn/palmte/work/model/process/ProcurementContract.java @@ -9,6 +9,7 @@ import javax.persistence.Id; import javax.persistence.Table; import cn.palmte.work.model.enums.ProcurementMode; +import cn.palmte.work.model.process.form.SaleContractProcessForm; import lombok.Data; /** @@ -35,4 +36,13 @@ public class ProcurementContract { private String paymentTerms; private Integer processId; + + public static ProcurementContract from(SaleContractProcessForm form) { + ProcurementContract contract = new ProcurementContract(); + contract.setMode(form.getProcurementMode()); + contract.setPaymentTerms(form.getPaymentTerms()); + contract.setSupplierName(form.getSupplierName()); + return contract; + } + } diff --git a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java index dd918a0..521d1bc 100644 --- a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java +++ b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java @@ -50,6 +50,9 @@ public class ProjectProcess { // 申请人 private String applyPersonName; + // 申请人 ID + private Integer applyPersonId; + // 申请部门 private String applyDept; diff --git a/src/main/java/cn/palmte/work/model/process/SaleContract.java b/src/main/java/cn/palmte/work/model/process/SaleContract.java index e63c863..e013ab2 100644 --- a/src/main/java/cn/palmte/work/model/process/SaleContract.java +++ b/src/main/java/cn/palmte/work/model/process/SaleContract.java @@ -8,6 +8,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import cn.palmte.work.model.process.form.SaleContractProcessForm; import lombok.Data; /** @@ -37,4 +38,12 @@ public class SaleContract { private Integer processId; + public static SaleContract from(SaleContractProcessForm form) { + SaleContract contract = new SaleContract(); + contract.setClientName(form.getClientName()); + contract.setPaymentTerms(form.getPaymentTerms()); + contract.setApplyPersonPhone(form.getApplyPersonPhone()); + return contract; + } + } diff --git a/src/main/java/cn/palmte/work/model/process/form/ProcessQueryForm.java b/src/main/java/cn/palmte/work/model/process/form/ProcessQueryForm.java index 471e581..1f4635c 100644 --- a/src/main/java/cn/palmte/work/model/process/form/ProcessQueryForm.java +++ b/src/main/java/cn/palmte/work/model/process/form/ProcessQueryForm.java @@ -15,6 +15,8 @@ public class ProcessQueryForm { private String projectTitle; private String applyPersonName; + private String contractNo; + private ProcessType processType; private ProcessStatus processStatus; diff --git a/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java index 3f04e95..02634ed 100644 --- a/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java +++ b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java @@ -7,6 +7,7 @@ import javax.validation.constraints.NotNull; import cn.palmte.work.model.enums.ProcessStatus; import cn.palmte.work.model.enums.ProcessType; +import cn.palmte.work.model.enums.ProcurementMode; import lombok.Data; /** @@ -71,4 +72,8 @@ public class SaleContractProcessForm { private List incomeDetails; + private ProcurementMode procurementMode; + + private String supplierName; + } diff --git a/src/main/resources/sql/2.0.sql b/src/main/resources/sql/2.0.sql index 1e40997..7a59f0b 100644 --- a/src/main/resources/sql/2.0.sql +++ b/src/main/resources/sql/2.0.sql @@ -8,6 +8,7 @@ create table project_process apply_dept varchar(255) null comment '申请部门', apply_dept_leader_name varchar(255) null comment '申请人领导', apply_person_name varchar(255) null comment '申请人姓名', + apply_person_id int null comment '申请人ID', contract_name varchar(255) null comment '合同名称', contract_no varchar(255) null comment '合同编号', project_id int null comment '项目ID', @@ -27,7 +28,7 @@ create table project_process ); alter table project_process - modify last_update_at datetime default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP comment '最后更新时间'; + add apply_person_id int null comment '申请人ID'; # 采购合同 create table procurement_contract