From 87de30b4eba8e52e05d24d06d90c6b214e8447dd Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 21 Dec 2022 18:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/controller/backend/ProcessController.java  | 4 ++++
 .../java/cn/palmte/work/model/process/ProjectProcess.java     | 3 ++-
 .../work/model/process/form/SaleContractProcessForm.java      | 3 +++
 src/main/resources/templates/admin/business/process-new.ftl   | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 66ef1a1..b01c936 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -202,6 +202,10 @@ public class ProcessController {
     entity.setSealTypes(SealTypeArray.of(form.getSealTypes()));
     entity.setApplyDept(String.join(",", form.getApplyDept()));
 
+    if (entity.getStatus() == null) {
+      entity.setStatus(ProcessStatus.to_be_audit);
+    }
+
     entityManager.persist(entity);
 
     SaleContract saleContract = new SaleContract();
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 37bd03f..dd918a0 100644
--- a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
+++ b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
@@ -41,7 +41,7 @@ public class ProjectProcess {
   // 项目编号
   private String projectNo;
 
-  @JsonFormat(pattern="yyyy-MM-dd")
+  @JsonFormat(pattern = "yyyy-MM-dd")
   private LocalDate applyDate;
 
   // 项目标题
@@ -84,6 +84,7 @@ public class ProjectProcess {
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private LocalDateTime createAt;
 
+  @Enumerated(EnumType.STRING)
   private ProcessType processType;
 
   private String remark;
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 e1806e9..3f04e95 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
@@ -6,6 +6,7 @@ import java.util.List;
 import javax.validation.constraints.NotNull;
 
 import cn.palmte.work.model.enums.ProcessStatus;
+import cn.palmte.work.model.enums.ProcessType;
 import lombok.Data;
 
 /**
@@ -66,6 +67,8 @@ public class SaleContractProcessForm {
 
   private ProcessStatus status;
 
+  private ProcessType processType;
+
   private List<SaleContractDetailForm> incomeDetails;
 
 }
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index a2d9463..a337798 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -741,6 +741,7 @@
 
             const form = {
               ...this.processForm,
+              processType: 'sale_contract',
               projectTitle: this.projectTitle,
               incomeDetails: this.incomeDetails.map(detail => ({
                 id: detail.id, expirationDate: detail.expirationDate