From 5711e79fa3c1d83295a3fa01695390926f1ba2ea Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 9 Aug 2024 15:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BB=BB=E5=8A=A1=E5=88=B6?=
 =?UTF-8?q?=E5=AE=9A=20=E5=8F=96=E6=B6=88=20=E6=98=BE=E7=A4=BA=E5=9C=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=EF=BC=88BS031=EF=BC=89=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APT.MS.Domain/Entities/BS/T_BS_SAFE_CHECK.cs  |  2 +-
 APT.MS.Domain/Enums/HM/HMMeetingEnmus.cs      | 39 ++++++++++++++++++-
 .../Controllers/Api/BSSafeCheckController.cs  |  1 +
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/APT.MS.Domain/Entities/BS/T_BS_SAFE_CHECK.cs b/APT.MS.Domain/Entities/BS/T_BS_SAFE_CHECK.cs
index 30be2d2..35ead0d 100644
--- a/APT.MS.Domain/Entities/BS/T_BS_SAFE_CHECK.cs
+++ b/APT.MS.Domain/Entities/BS/T_BS_SAFE_CHECK.cs
@@ -171,7 +171,7 @@ namespace APT.MS.Domain.Entities.BS
         [FormFieldTable]
         [FormFieldQuery]
         //[FormFieldEdit]
-        [EnumName("HMAuditStatusEnmu")]
+        [EnumName("HMAuditStatusEnmus")]
         public int STATUSPLAN { get; set; }
 
 
diff --git a/APT.MS.Domain/Enums/HM/HMMeetingEnmus.cs b/APT.MS.Domain/Enums/HM/HMMeetingEnmus.cs
index 116376e..5c8ba13 100644
--- a/APT.MS.Domain/Enums/HM/HMMeetingEnmus.cs
+++ b/APT.MS.Domain/Enums/HM/HMMeetingEnmus.cs
@@ -37,6 +37,41 @@ namespace APT.MS.Domain.Enums
         审批驳回 = 30,
     }
     /// <summary>
+    /// 审批状态
+    /// </summary>
+    public enum HMAuditStatusEnmus
+    {
+        /// <summary>
+        /// 草稿：0
+        /// </summary>
+        草稿 = 0,
+        /// <summary>
+        /// 已取消：1
+        /// </summary>
+        已取消 = 1,
+
+        /// <summary>
+        /// 确认中：5
+        /// </summary>
+        确认中 = 5,
+        /// <summary>
+        /// 确认中：6
+        /// </summary>
+        签到中 = 6,
+        /// <summary>
+        /// 审批中：10
+        /// </summary>
+        审批中 = 10,
+        /// <summary>
+        /// 审批通过：20
+        /// </summary>
+        归档 = 20,
+        /// <summary>
+        /// 审批驳回：30
+        /// </summary>
+        审批驳回 = 30,
+    }
+    /// <summary>
     /// 通知发布类型
     /// </summary>
     public enum HMNoticeReleaseTypeEnmu
@@ -48,7 +83,7 @@ namespace APT.MS.Domain.Enums
         /// <summary>
         /// 作业任务分析文件发布：1
         /// </summary>
-        作业任务分析文件发布 = 1, 
+        作业任务分析文件发布 = 1,
     }
 
     /// <summary>
@@ -86,6 +121,6 @@ namespace APT.MS.Domain.Enums
         /// 不同意：2
         /// </summary>
         不同意 = 2,
-      
+
     }
 }
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
index a8b90c2..c4d177f 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
@@ -8574,6 +8574,7 @@ namespace APT.BS.WebApi.Controllers.Api
                 Check.IS_CANCEL = true;
                 Check.USER_ID_CANCEL = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
                 Check.REMARK_CANCEL = filter.Parameter2;
+                Check.STATUSPLAN = (int)HMAuditStatusEnmus.已取消;
 
                 T_FM_NOTIFICATION_TASK task = null;
                 if (TaskID != Guid.Empty)