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, } /// + /// 审批状态 + /// + public enum HMAuditStatusEnmus + { + /// + /// 草稿:0 + /// + 草稿 = 0, + /// + /// 已取消:1 + /// + 已取消 = 1, + + /// + /// 确认中:5 + /// + 确认中 = 5, + /// + /// 确认中:6 + /// + 签到中 = 6, + /// + /// 审批中:10 + /// + 审批中 = 10, + /// + /// 审批通过:20 + /// + 归档 = 20, + /// + /// 审批驳回:30 + /// + 审批驳回 = 30, + } + /// /// 通知发布类型 /// public enum HMNoticeReleaseTypeEnmu @@ -48,7 +83,7 @@ namespace APT.MS.Domain.Enums /// /// 作业任务分析文件发布:1 /// - 作业任务分析文件发布 = 1, + 作业任务分析文件发布 = 1, } /// @@ -86,6 +121,6 @@ namespace APT.MS.Domain.Enums /// 不同意:2 /// 不同意 = 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)