From 648b3b549f2bf8d344e2ded56d23e617e1296742 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 13 Oct 2023 10:19:12 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessEsInitChange.java           | 30 +++++++++++++++++++
 .../entity/enums/ESProjectType.java           | 16 +++++-----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
index bdab0627..0f6aa56e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
@@ -34,6 +34,36 @@ public class ProcessEsInitChange implements Serializable {
     /** 企标计划ID */
     private String espId;
 
+    /**
+     * 标准编号1
+     */
+    private String standardNoOne;
+
+    /**
+     * 标准名称1
+     */
+    private String standardNameOne;
+
+    /**
+     * 制修订类型1
+     */
+    private String projectTypeOne;
+
+    /**
+     * 标准编号2
+     */
+    private String standardNoTwo;
+
+    /**
+     * 标准名称2
+     */
+    private String standardNameTwo;
+
+    /**
+     * 制修订类型2
+     */
+    private String projectTypeTwo;
+
     /**
      * 创建人
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESProjectType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESProjectType.java
index 9a85e330..e208da8a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESProjectType.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESProjectType.java
@@ -6,15 +6,15 @@ package com.jero.modules.activiti.process.esInitChange.entity.enums;
  */
 public enum ESProjectType {
 
-    /** 变更 **/
-    COMPLETE_TIME_CHANGE("完成时间变更", "1"),
-    WORK_TERMINATE("工作中止", "2"),
-    RESPONSIBLE_DEPT_CHANGE("责任部门变更", "3"),
-    MERGE("合并", "4"),
-
     /** 立项 **/
-    ENACT("制定", "5"),
-    MODIFY("修订", "6"),
+    ENACT("制定", "1"),
+    MODIFY("修订", "2"),
+
+    /** 变更 **/
+    COMPLETE_TIME_CHANGE("完成时间变更", "3"),
+    WORK_TERMINATE("工作中止", "4"),
+    RESPONSIBLE_DEPT_CHANGE("责任部门变更", "5"),
+    MERGE("合并", "6"),
     ;
 
     private final String name;