From 204da853c3afea46f2d89cded1ba945e82527bc1 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Fri, 17 Jul 2020 11:27:27 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2442]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java  |  6 +++---
 .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java     | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java
index 9b2b76a..6fbf7bc 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java
@@ -625,9 +625,9 @@ public class PtlEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_TASK_STATUS {
         CREATE(10, "创建"),
-        EXECUTION(20, "执行中"),
-        COMPLETE(30, "完成"),
-        CANCEL(40, "取消");
+        COMPLETE(20, "完成"),
+        CLOSE(30, "关闭"),
+        EXECUTION(40, "执行中");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
index d29b37b..9c85618 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
@@ -830,7 +830,8 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_DETAIL_STATUS {
         CREATE(10, "CREATE", "创建"),
-        COMPLETE(20, "COMPLETE", "完成");
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;
@@ -860,8 +861,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_STATUS {
-        CREATE(10, "CREATE", "新建"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
+        CREATE(10, "CREATE", "创建"),
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;
@@ -915,10 +917,10 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_MAIN_TASK_STATUS {
-        CREATE(10, "CREATE", "新建"),
-        RECEIPT(20, "RECEIPT", "执行中"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
-        CANCELLED(40, "CANCELLED", "已取消");
+        CREATE(10, "CREATE", "创建"),
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭"),
+        EXECUTION(40, "EXECUTION", "执行中");
 
         private int value;
         private String code;
@@ -1413,7 +1415,8 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_TASK_STATUS {
         CREATE(10, "CREATE", "创建"),
-        RECEIPT_FINISH(30, "COMPLETED", "完成");
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;