From 3fc38ecffa26e310ceeb07335b6f41ddaa3cb1a5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 20 Nov 2020 15:50:39 +0800
Subject: [PATCH] =?UTF-8?q?issue=5Fapplication=E3=80=81issue=5Fapplication?=
 =?UTF-8?q?=5Fhistory=20=E6=96=B0=E5=A2=9Eauto=5Fpassed:=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IssueApplicationDTO.java        | 2 +-
 .../src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java | 1 +
 .../src/main/java/com/epmet/entity/IssueApplicationEntity.java  | 2 +-
 .../java/com/epmet/entity/IssueApplicationHistoryEntity.java    | 1 +
 .../db/migration/V0.0.4__issue_audit_addautopassed.sql          | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.4__issue_audit_addautopassed.sql

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java
index ed743d720d..ceb24d7d18 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java
@@ -55,7 +55,7 @@ public class IssueApplicationDTO implements Serializable {
 	private String suggestion;
 
     /**
-     * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回
+     * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回;自动通过：auto_passed
      */
 	private String applyStatus;
 
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java
index fdde89c383..b81e50b7f8 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java
@@ -53,6 +53,7 @@ public class IssueApplicationHistoryDTO implements Serializable {
      * under_auditing:待审核；
      * approved:审核通过；
      * rejected:驳回；
+     * auto_passed:自动通过
      */
 	private String actionType;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java
index d117c370e9..1b68f2852c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java
@@ -51,7 +51,7 @@ public class IssueApplicationEntity extends BaseEpmetEntity {
 	private String suggestion;
 
     /**
-	 * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回
+	 * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回;自动通过：auto_passed
      */
 	private String applyStatus;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java
index 983dd8e550..516334333e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java
@@ -49,6 +49,7 @@ public class IssueApplicationHistoryEntity extends BaseEpmetEntity {
      * under_auditing:待审核；
 	 * approved:审核通过；
 	 * rejected:驳回；
+	 * auto_passed:自动通过
      */
 	private String actionType;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.4__issue_audit_addautopassed.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.4__issue_audit_addautopassed.sql
new file mode 100644
index 0000000000..9917d87b41
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.4__issue_audit_addautopassed.sql
@@ -0,0 +1,2 @@
+ALTER TABLE issue_application MODIFY APPLY_STATUS VARCHAR(32) NOT NULL comment '审核状态：under_auditing:待审核；approved:通过；rejected:驳回;自动通过：auto_passed';
+alter table issue_application_history modify ACTION_TYPE varchar(32) not null comment 'under_auditing:提交审核；approved:审核通过，rejected:驳回;auto_passed:自动通过';
\ No newline at end of file