diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 66ead39..e94009f 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -11361,6 +11361,7 @@ namespace APT.BaseData.Services.DomainServices record.HIDDEN_DANGER_CONFIRM_ID = null; record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + random.Next(1, 999); record.MineType = entity.MineType; + record.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; record.RISK_AREA_ID = detail.RISK_AREA_ID; record.HIDDEN_PLACE = detail.HIDDEN_PLACE; record.HIDDEN_DESCRIPTION = detail.HIDDEN_DESCRIPTION; @@ -11416,7 +11417,8 @@ namespace APT.BaseData.Services.DomainServices notice.HIDDEN_DANGER_CONFIRM_ID = null; notice.APPLY_USER_ID = entity.APPLY_USER_ID; notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID; - notice.MineType = entity.MineType; + notice.MineType = entity.MineType; + notice.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY; notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; @@ -11672,7 +11674,8 @@ namespace APT.BaseData.Services.DomainServices record.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID; record.HIDDEN_DANGER_CONFIRM_ID = entity.ID; record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); - record.MineType = entity.MineType; + record.MineType = entity.MineType; + record.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; record.RISK_AREA_ID = entity.RISK_AREA_ID; record.HIDDEN_PLACE = entity.HIDDEN_PLACE; record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_ID; @@ -11713,7 +11716,8 @@ namespace APT.BaseData.Services.DomainServices notice.HIDDEN_DANGER_CONFIRM_ID = entity.ID; notice.APPLY_USER_ID = entity.APPLY_USER_ID; notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID; - notice.MineType = entity.MineType; + notice.MineType = entity.MineType; + notice.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY; notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; @@ -12304,7 +12308,8 @@ namespace APT.BaseData.Services.DomainServices { T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL(); ideDetail.ORG_ID = entity.ORG_ID; - ideDetail.RISK_IDENTIFY_ID = ide.ID; + ideDetail.RISK_IDENTIFY_ID = ide.ID; + ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID; ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType; ideDetail.AREA_ID = library?.AREA_ID; ideDetail.RISK_NAME = library?.RISK_NAME; @@ -12549,7 +12554,7 @@ namespace APT.BaseData.Services.DomainServices //Expression> expression2 = i => i.IS_DELETED == false && identityIds.Contains(i.RISK_IDENTIFY_ID); //List list = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID)).ToList(); var list = this.GetEntities(t => identityIds.Contains(t.RISK_IDENTIFY_ID), new BaseFilter(entity.ORG_ID)); - var detailList = list.GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }); + var detailList = list.GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }); if (detailList.Any()) { foreach (var item in detailList) @@ -12572,6 +12577,7 @@ namespace APT.BaseData.Services.DomainServices ideDetail.ORG_ID = entity.ORG_ID; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; ideDetail.MineType = item.Key.MineType; + ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.RISK_NAME = item.Key.RISK_NAME; ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID; @@ -12874,16 +12880,17 @@ namespace APT.BaseData.Services.DomainServices //Expression> expression2 = i => i.IS_DELETED == false && resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID); //List details = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID), new string[] { "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts" }).ToList(); var details = GetEntities(i => resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID) && i.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts"); - var detailList = details.GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }); + var detailList = details.GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }); if (detailList.Any()) { foreach (var de in detailList) { - var temp = details.FirstOrDefault(m => m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID); + var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL(); ideDetail.ORG_ID = entity.ORG_ID; ideDetail.IDENTIFY_RESULT_SUMMARY_ID = sum.ID; - ideDetail.MineType = de.Key.MineType; + ideDetail.MineType = de.Key.MineType; + ideDetail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID; ideDetail.AREA_ID = de.Key.AREA_ID; ideDetail.RISK_NAME = de.Key.RISK_NAME; ideDetail.RISK_NAME_ID = de.Key.RISK_NAME_ID; @@ -13089,11 +13096,12 @@ namespace APT.BaseData.Services.DomainServices { if (de != null) { - var departTemp = librarys.FirstOrDefault(t => t.MineType == de.MineType && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_NAME_ID == de.RISK_NAME_ID && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID); + var departTemp = librarys.FirstOrDefault(t =>t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.MineType == de.MineType && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_NAME_ID == de.RISK_NAME_ID && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID); T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL(); detail.ORG_ID = entity.ORG_ID; detail.RISK_EVALUATION_ID = result.ID; - detail.MineType = de.MineType; + detail.MineType = de.MineType; + detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID; detail.AREA_ID = de.AREA_ID; detail.RISK_NAME = de.RISK_NAME; detail.RISK_NAME_ID = de.RISK_NAME_ID; @@ -13361,15 +13369,16 @@ namespace APT.BaseData.Services.DomainServices result.ISCOMPANY = entity.ISCOMPANY; var resultIds = results.Select(t => t.ID).ToList(); var details = GetEntities(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts"); - var detailList = details.GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }); + var detailList = details.GroupBy(m => new { m.AREA_ID,m.PRODUCTION_UNIT_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }); if (detailList.Any()) { foreach (var de in detailList) { - var temp = details.FirstOrDefault(m => m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID); + var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID); T_SK_RISK_EVALUATION_SUMMARY_DETAIL detail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL(); detail.ORG_ID = entity.ORG_ID; detail.RISK_EVALUATION_SUMMARY_ID = result.ID; + detail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID; detail.MineType = de == null ? SKProductionUnit.Mine : de.Key.MineType; detail.AREA_ID = de.Key.AREA_ID; detail.RISK_NAME = de.Key.RISK_NAME; @@ -13475,7 +13484,8 @@ namespace APT.BaseData.Services.DomainServices { T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL detail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL(); detail.ORG_ID = item.ORG_ID; - detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID; + detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID; + detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; detail.MineType = item.MineType; detail.AREA_ID = item.AREA_ID; detail.TYPE_ID = item.TYPE_ID; @@ -13743,6 +13753,7 @@ namespace APT.BaseData.Services.DomainServices T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL detail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL(); detail.ORG_ID = item.ORG_ID; detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID; + detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; detail.MineType = item.MineType; detail.AREA_ID = item.AREA_ID; detail.TYPE_ID = item.TYPE_ID; diff --git a/APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY.cs b/APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY.cs index b06fb49..ab87e4b 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums.SK; @@ -21,6 +22,12 @@ namespace APT.MS.Domain.Entities.SK [Description("生产单元")] [EnumName("SKProductionUnit")] public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 辨识区域 /// diff --git a/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS.cs b/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS.cs index 298d168..302931c 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS.cs @@ -1,4 +1,5 @@ -using APT.Infrastructure.Core; +using APT.BaseData.Domain.Entities.FM; +using APT.Infrastructure.Core; using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Enums; using APT.MS.Domain.Enums.SK; @@ -17,7 +18,13 @@ namespace APT.MS.Domain.Entities.SK { [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit? MineType { get; set; } + public SKProductionUnit? MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查内容 /// diff --git a/APT.MS.Domain/Entities/SK/T_SK_CHECK_SET.cs b/APT.MS.Domain/Entities/SK/T_SK_CHECK_SET.cs index 0bebb74..73a51ff 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_CHECK_SET.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_CHECK_SET.cs @@ -16,7 +16,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } [Description("组织结构")] [DataFieldForeignKey("Nav_Department")] diff --git a/APT.MS.Domain/Entities/SK/T_SK_CHECK_TYPE.cs b/APT.MS.Domain/Entities/SK/T_SK_CHECK_TYPE.cs index 1386663..6d4933f 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_CHECK_TYPE.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_CHECK_TYPE.cs @@ -1,4 +1,5 @@ -using APT.Infrastructure.Core; +using APT.BaseData.Domain.Entities.FM; +using APT.Infrastructure.Core; using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Enums.SK; using System; @@ -52,6 +53,12 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM.cs b/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM.cs index e8addad..eba4681 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM.cs @@ -147,6 +147,13 @@ namespace APT.MS.Domain.Entities.SK [Description("驳回意见")] [DataFieldIngore] - public string CONTEXT { get; set; } + public string CONTEXT { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs b/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs index d8a3f15..0e06f07 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums; @@ -31,7 +32,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 辨识区域 /// diff --git a/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY.cs b/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY.cs index 1abc4b6..0291cd6 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums; @@ -21,7 +22,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 辨识区域 /// diff --git a/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART.cs b/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART.cs index f0345bb..b18ba69 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART.cs @@ -99,6 +99,14 @@ namespace APT.MS.Domain.Entities.SK [DataFieldIngore] - public string DEPART_NAME { get; set; } + public string DEPART_NAME { get; set; } + + [DataFieldIngore] + + public string MINE_NAME { get; set; } + + [DataFieldIngore] + + public Guid? PRODUCTION_UNIT_ID { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs index 3603b21..1dc65db 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs @@ -49,7 +49,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查区域 /// @@ -210,6 +216,13 @@ namespace APT.MS.Domain.Entities.SK /// 导航属性：检查依据 /// [Description("导航：检查依据")] - public virtual ICollection Nav_Basics { get; set; } + public virtual ICollection Nav_Basics { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_HAND_REPORT.cs b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_HAND_REPORT.cs index c115c4c..d8e6ff4 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_HAND_REPORT.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_HAND_REPORT.cs @@ -36,7 +36,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查区域 @@ -75,6 +81,13 @@ namespace APT.MS.Domain.Entities.SK [Description("是否发布")] [DataFieldIngore] - public string PUBLISH { get; set; } + public string PUBLISH { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY.cs b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY.cs index a879548..d7823cd 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY.cs @@ -45,7 +45,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 延期整改理由 @@ -69,6 +75,13 @@ namespace APT.MS.Domain.Entities.SK [Description("驳回意见")] [DataFieldIngore] - public string CONTEXT { get; set; } + public string CONTEXT { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE.cs b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE.cs index 05a2d8f..e56e775 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE.cs @@ -51,7 +51,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查类型 @@ -131,6 +137,13 @@ namespace APT.MS.Domain.Entities.SK [Description("整改落实人")] public string ImplementUser { get; set; } [Description("验收人")] - public string AcceptUser { get; set; } + public string AcceptUser { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs index fe307c7..6746517 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs @@ -77,7 +77,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查区域 @@ -265,6 +271,13 @@ namespace APT.MS.Domain.Entities.SK public virtual ICollection Nav_RectifyBasics { get; set; } [Description("备注")] - public string REMARK { get; set; } + public string REMARK { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT.cs b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT.cs index 5aec885..2cdfc7e 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT.cs @@ -37,7 +37,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查类型 /// @@ -100,6 +106,13 @@ namespace APT.MS.Domain.Entities.SK [Description("驳回意见")] [DataFieldIngore] - public string CONTEXT { get; set; } + public string CONTEXT { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN.cs b/APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN.cs index 76b3fc7..0b7a55d 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN.cs @@ -77,6 +77,13 @@ namespace APT.MS.Domain.Entities.SK [Description("驳回意见")] [DataFieldIngore] - public string CONTEXT { get; set; } + public string CONTEXT { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_PLAN_SET.cs b/APT.MS.Domain/Entities/SK/T_SK_PLAN_SET.cs index 0e90891..ff5b453 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_PLAN_SET.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_PLAN_SET.cs @@ -111,11 +111,17 @@ namespace APT.MS.Domain.Entities.SK public int ENABLE_STATUS { get; set; } /// - /// 检查范围 + /// 生产单元 /// - [Description("检查范围")] + [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查部门范围 diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_AREA.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_AREA.cs index 4a6d2bc..3b90112 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_AREA.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_AREA.cs @@ -47,7 +47,13 @@ namespace APT.MS.Domain.Entities.SK [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit? MineType { get; set; } + public SKProductionUnit? MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION.cs index 44845bf..d1979aa 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION.cs @@ -73,6 +73,13 @@ namespace APT.MS.Domain.Entities.SK [Description("是否公司级")] [EnumName("SKIsStoreEnum")] - public SKIsStoreEnum ISCOMPANY { get; set; } + public SKIsStoreEnum ISCOMPANY { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs index b34b7b7..229934a 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums.SK; @@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } [Description("序号")] diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY.cs index 1ed956a..a3fb01e 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY.cs @@ -72,6 +72,13 @@ namespace APT.MS.Domain.Entities.SK public string CONTEXT { get; set; } [Description("是否公司级")] [EnumName("SKIsStoreEnum")] - public SKIsStoreEnum ISCOMPANY { get; set; } + public SKIsStoreEnum ISCOMPANY { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs index 515a536..81457e9 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums.SK; @@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } [Description("序号")] diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY.cs index 073f59d..fc58cf2 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY.cs @@ -78,6 +78,13 @@ namespace APT.MS.Domain.Entities.SK [Description("驳回意见")] [DataFieldIngore] - public string CONTEXT { get; set; } + public string CONTEXT { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_DETAIL.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_DETAIL.cs index 955a255..4a70d69 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_DETAIL.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_DETAIL.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums.SK; @@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } [Description("序号")] diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT.cs index d8fa401..fdfc297 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT.cs @@ -89,6 +89,13 @@ namespace APT.MS.Domain.Entities.SK [Description("是否公司级")] [EnumName("SKIsStoreEnum")] - public SKIsStoreEnum ISCOMPANY { get; set; } + public SKIsStoreEnum ISCOMPANY { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_DETAIL.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_DETAIL.cs index c2eff93..4a727a2 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_DETAIL.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_DETAIL.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums.SK; @@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } [Description("序号")] diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY.cs index 8a2b7ec..b7f549b 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY.cs @@ -87,6 +87,13 @@ namespace APT.MS.Domain.Entities.SK [Description("是否公司级")] [EnumName("SKIsStoreEnum")] - public SKIsStoreEnum ISCOMPANY { get; set; } + public SKIsStoreEnum ISCOMPANY { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL.cs index 34e1f24..2c77477 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL.cs @@ -1,4 +1,5 @@ -using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Enums; using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Enums.SK; @@ -29,7 +30,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } [Description("序号")] diff --git a/APT.MS.Domain/Entities/SK/T_SK_RISK_TYPE.cs b/APT.MS.Domain/Entities/SK/T_SK_RISK_TYPE.cs index fee2316..430348a 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_RISK_TYPE.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_RISK_TYPE.cs @@ -1,4 +1,5 @@ -using APT.Infrastructure.Core; +using APT.BaseData.Domain.Entities.FM; +using APT.Infrastructure.Core; using APT.MS.Domain.Enums; using System; using System.Collections.Generic; @@ -31,6 +32,12 @@ namespace APT.MS.Domain.Entities.SK [FormFieldQuery] [FormFieldEdit] [EnumName("STATUSEnum")] - public STATUSEnum STATUS { get; set; } + public STATUSEnum STATUS { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_NOTICE.cs b/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_NOTICE.cs index 11abac3..1d45b61 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_NOTICE.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_NOTICE.cs @@ -8,6 +8,7 @@ using APT.MS.Domain.Enums.SK; using System; using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; using System.Text; namespace APT.MS.Domain.Entities.SK @@ -29,13 +30,18 @@ namespace APT.MS.Domain.Entities.SK [Description("导航属性：发起部门")] public virtual T_FM_DEPARTMENT Nav_ApplyDepartment { get; set; } - /// /// 生产单元 /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查类型 @@ -98,6 +104,13 @@ namespace APT.MS.Domain.Entities.SK [Description("驳回意见")] [DataFieldIngore] - public string CONTEXT { get; set; } + public string CONTEXT { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD.cs b/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD.cs index bc448d0..61fa7c8 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD.cs @@ -38,7 +38,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查类型 /// @@ -118,6 +124,13 @@ namespace APT.MS.Domain.Entities.SK public Guid? RECORD_USER_ID { get; set; } [Description("导航属性：记录人")] - public virtual T_FM_USER Nav_RecordUser { get; set; } + public virtual T_FM_USER Nav_RecordUser { get; set; } + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY.cs b/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY.cs index 4051817..9f54ebb 100644 --- a/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY.cs +++ b/APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY.cs @@ -40,7 +40,13 @@ namespace APT.MS.Domain.Entities.SK /// [Description("生产单元")] [EnumName("SKProductionUnit")] - public SKProductionUnit MineType { get; set; } + public SKProductionUnit MineType { get; set; } + + [Description("生产单元")] + [DataFieldForeignKey("Nav_ProductionUnit")] + public Guid? PRODUCTION_UNIT_ID { get; set; } + [Description("导航属性：生产单元")] + public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } /// /// 检查类型 /// @@ -99,6 +105,13 @@ namespace APT.MS.Domain.Entities.SK /// 是否自动触发 /// [Description("是否自动触发")] - public bool ISAUTO { get; set; } = false; + public bool ISAUTO { get; set; } = false; + + [Description("发起人部门")] + [DataFieldLength(50)] + public string ApplyDepartmentName { get; set; } + [DataFieldLength(50)] + [Description("发起人岗位")] + public string ApplyPostName { get; set; } } } diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs index 5641f97..2abf676 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs @@ -55,7 +55,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM var result = WitOrderEntities(null, filter); if (result.Data.Count() > 0) { - var users = this.GetEntities(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(filter.OrgId)).ToList(); + var users = this.GetEntities(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && !t.CODE.Contains("admin"), new BaseFilter(filter.OrgId)).ToList(); foreach (var item in result.Data) { List outPartmentIds = new List(); @@ -513,7 +513,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM main = entity; if (entity.Nav_DepartmentUser != null && entity.Nav_DepartmentUser.Any()) { - main.Nav_DepartmentUser = entity.Nav_DepartmentUser.Where(t => !t.Nav_User.CODE.Contains("admin")).ToList(); + main.Nav_DepartmentUser = entity.Nav_DepartmentUser.Where(t => !t.Nav_User.CODE.Contains("admin")).OrderBy(m=>m.Nav_User.NUM).ToList(); } else { @@ -534,7 +534,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM departmentUser.Add(us); }); //main.Nav_DepartmentUser = departmentUser.OrderByDescending(e => e.Nav_User.APPROVE_ROLE_ID).ToList();//wyw 有审批角色的显示再前面 - main.Nav_DepartmentUser = departmentUser.OrderByDescending(e => e.Nav_User.Nav_ApproveRole?.CODE).ToList(); + main.Nav_DepartmentUser = departmentUser.OrderBy(t=>t.Nav_User?.NUM).ThenByDescending(e => e.Nav_User.Nav_ApproveRole?.CODE).ToList(); } } } diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 2fffca8..6773b66 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -51,6 +51,7 @@ namespace APT.PP.WebApi.Controllers.Api { public class CheckListNew { + public Guid? PRODUCTION_UNIT_ID { get; set; } public SKProductionUnit Mine { get; set; } public SKPLANCHECKFREQUENCYEnum Cycle { get; set; } public SKDepartmentTypeEnum DepartType { get; set; } @@ -624,6 +625,7 @@ namespace APT.PP.WebApi.Controllers.Api record.SECURITY_INSPECTION_NOTICE_ID = item.ID; record.ORG_ID = filter.GetOrgId(); record.MineType = item.MineType; + record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; record.APPLY_DEPARTMENT_ID = item.APPLY_DEPARTMENT_ID; record.APPLY_USER_ID = item.APPLY_USER_ID; record.CHECK_TYPE_ID = item.CHECK_TYPE_ID; @@ -1096,6 +1098,7 @@ namespace APT.PP.WebApi.Controllers.Api T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL(); ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_ID = ide.ID; + ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID; ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType; ideDetail.AREA_ID = library?.AREA_ID; ideDetail.RISK_DESCRIPTION = library?.RISK_DESCRIPTION; @@ -1338,6 +1341,7 @@ namespace APT.PP.WebApi.Controllers.Api T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL(); ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_ID = ide.ID; + ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID; ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType; ideDetail.AREA_ID = library?.AREA_ID; ideDetail.RISK_DESCRIPTION = library?.RISK_DESCRIPTION; @@ -1517,14 +1521,14 @@ namespace APT.PP.WebApi.Controllers.Api results.Add(result); var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList(); //汇总去重 - var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); - var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); + var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); + var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); detailListYes.AddRange(detailListNo); if (detailListYes.Any()) { foreach (var item in detailListYes) { - var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); + var temp = list.Where(m =>m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); //只取有效的部门岗位 var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes); var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList(); @@ -1533,6 +1537,7 @@ namespace APT.PP.WebApi.Controllers.Api T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; + ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.MineType = item.Key.MineType; ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.RISK_NAME = item.Key.RISK_NAME; @@ -1647,14 +1652,14 @@ namespace APT.PP.WebApi.Controllers.Api var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de).Select(t => t.ID).ToList(); var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList(); //汇总去重 - var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); - var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); + var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); + var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); detailListYes.AddRange(detailListNo); if (detailListYes.Any()) { foreach (var item in detailListYes) { - var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); + var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); //只取有效的部门岗位 var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes); var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList(); @@ -1663,7 +1668,8 @@ namespace APT.PP.WebApi.Controllers.Api T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; - ideDetail.MineType = item.Key.MineType; + ideDetail.MineType = item.Key.MineType; + ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.RISK_NAME = item.Key.RISK_NAME; ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID; @@ -1783,14 +1789,14 @@ namespace APT.PP.WebApi.Controllers.Api var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de || classIds.Contains((Guid)m.APPLY_DEPARTMENT_ID)).Select(t => t.ID).ToList(); var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList(); //汇总去重 - var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); - var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); + var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); + var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); detailListYes.AddRange(detailListNo); if (detailListYes.Any()) { foreach (var item in detailListYes) { - var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); + var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); //只取有效的部门岗位 var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes); var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList(); @@ -1799,6 +1805,7 @@ namespace APT.PP.WebApi.Controllers.Api T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; + ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.MineType = item.Key.MineType; ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.RISK_NAME = item.Key.RISK_NAME; @@ -4911,7 +4918,7 @@ namespace APT.PP.WebApi.Controllers.Api var departs = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User"); var users = this.GetEntities(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin") && t.Nav_Person != null, new BaseFilter(filter.OrgId), "Nav_Person", "Nav_ApproveRole"); var checkCycles = setList.Select(t => t.CHECK_CYCLE).Distinct().ToList(); - var librarys = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").ToList(); + var librarys = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_ProductionUnit").ToList(); var libraryDetails = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList(); var contents = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Contents").ToList(); var contentDeparts = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList(); @@ -4943,6 +4950,7 @@ namespace APT.PP.WebApi.Controllers.Api T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); de.POST_NAME = post?.NAME; de.MineType = item.MineType; + de.MINE_NAME = item.Nav_ProductionUnit?.NAME; de.AREA_NAME = item.Nav_Area?.NAME; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_ID = item.ID; @@ -4962,7 +4970,9 @@ namespace APT.PP.WebApi.Controllers.Api { T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); de.POST_NAME = "未配置辨识岗位"; - de.MineType = item.MineType; + de.MineType = item.MineType; + de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; + de.MINE_NAME = item.Nav_ProductionUnit?.NAME; de.AREA_NAME = item.Nav_Area?.NAME; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_ID = item.ID; @@ -5020,14 +5030,14 @@ namespace APT.PP.WebApi.Controllers.Api } } } - var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList(); + var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType,t.PRODUCTION_UNIT_ID, t.MINE_NAME,t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList(); foreach (var item in group) { CheckListNew listNew = new CheckListNew(); - listNew.Mine = item.Key.MineType; + listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; listNew.Cycle = item.Key.CHECK_CYCLE; listNew.DepartType = item.Key.CHECK_TYPE; - listNew.MineType = item.Key.MineType.GetDescription(); + listNew.MineType = item.Key.MINE_NAME; listNew.CheckType = item.Key.TYPE_NAME; listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription(); listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription(); @@ -5103,6 +5113,7 @@ namespace APT.PP.WebApi.Controllers.Api record.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; record.APPLY_USER_ID = userInfo.ID; record.MineType = item.Mine; + record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; record.CHECK_TYPE_ID = item.CheckTypeId; record.PLANCHECKFREQUENCY = item.Cycle; record.DEPARTMENT_TYPE = item.DepartType; @@ -5197,6 +5208,7 @@ namespace APT.PP.WebApi.Controllers.Api safeNotice.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; safeNotice.APPLY_USER_ID = userInfo.ID; safeNotice.MineType = item.Mine; + safeNotice.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; safeNotice.CHECK_TYPE_ID = item.CheckTypeId; safeNotice.PLANCHECKFREQUENCY = item.Cycle; safeNotice.DEPARTMENT_TYPE = item.DepartType; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs index e291205..0516c71 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs @@ -54,7 +54,9 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.APPLY_USER_ID == null) { entity.APPLY_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - } + } + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == entity.APPLY_USER_ID, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List detailIds = new List(); List detailDepartIds = new List(); List detailPostIds = new List(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs index 85e7fbe..cf89b8c 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs @@ -52,7 +52,9 @@ namespace APT.SK.WebApi.Controllers.Api var files = entity.Nav_Files; entity.Nav_Files = null; var basics = entity.Nav_Basics; - entity.Nav_Basics = null; + entity.Nav_Basics = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; if (string.IsNullOrEmpty(entity.HIDDEN_DESCRIPTION)) { entity.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs index 63056c6..960070e 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs @@ -58,7 +58,9 @@ namespace APT.SK.WebApi.Controllers.Api entity.ORG_ID = orgId; var files = entity.Nav_ReportFiles; entity.Nav_ReportFiles = null; - entity.Nav_RiskArea = null; + entity.Nav_RiskArea = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; if (files != null && files.Any()) { foreach (var item in files) @@ -86,7 +88,8 @@ namespace APT.SK.WebApi.Controllers.Api confirm = new T_SK_HIDDEN_DANGER_CONFIRM(); confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID; confirm.ORG_ID = entity.ORG_ID; - confirm.MineType = entity.MineType; + confirm.MineType = entity.MineType; + confirm.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; confirm.APPLY_USER_ID = entity.APPLY_USER_ID; confirm.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID; confirm.RISK_AREA_ID = entity.RISK_AREA_ID; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs index 0529ac7..d55cb42 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs @@ -40,7 +40,9 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.APPLY_USER_ID == null) entity.APPLY_USER_ID = userId; if (entity.APPLY_DEPARTMENT_ID == null) - entity.APPLY_DEPARTMENT_ID = departId; + entity.APPLY_DEPARTMENT_ID = departId; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { var record = this.GetEntity(t => t.ID == entity.HIDDEN_DANGER_RECTIFY_RECORD_ID); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs index d1bd227..1f29b86 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs @@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_RectifyDetails; entity.Nav_RectifyDetails = null; var files = entity.Nav_RectifyFiles; - entity.Nav_RectifyFiles = null; + entity.Nav_RectifyFiles = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteFileIds = new List(); List deleteBasicIds = new List(); List deleteDetailIds = new List(); @@ -554,6 +556,7 @@ namespace APT.SK.WebApi.Controllers.Api record.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = detail.ID; record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + random.Next(1, 999); record.MineType = notice.MineType; + record.PRODUCTION_UNIT_ID = notice.PRODUCTION_UNIT_ID; record.RISK_AREA_ID = detail.RISK_AREA_ID; record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID; record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 06560ae..1fe70f6 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -47,7 +47,9 @@ namespace APT.SK.WebApi.Controllers if (entity.APPLY_USER_ID == null) entity.APPLY_USER_ID = userId; if (entity.APPLY_DEPARTMENT_ID == null) - entity.APPLY_DEPARTMENT_ID = departId; + entity.APPLY_DEPARTMENT_ID = departId; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; if (entity.IMPLEMENT_USER_ID == entity.ACCEPT_USER_ID) { throw new Exception("验收人和落实人不能是同一个人"); @@ -70,6 +72,7 @@ namespace APT.SK.WebApi.Controllers entity.IMPLEMENT_USER_ID = record.IMPLEMENT_USER_ID; entity.CHECK_TIME = record.CHECK_TIME; entity.CHECK_PERSON = record.CHECK_PERSON; + entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; } var photoas = entity.Nav_RectifyPhotoas; entity.Nav_RectifyPhotoas = null; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs index 9015f43..21ee70a 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs @@ -60,7 +60,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_ReportDetails; entity.Nav_ReportDetails = null; var files = entity.Nav_ReportFiles; - entity.Nav_ReportFiles = null; + entity.Nav_ReportFiles = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; List userIds = new List(); List deleteFileIds = new List(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs index 8ce1cfc..1e80891 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs @@ -1,254 +1,256 @@ -using APT.BaseData.Domain.Entities.FM; -using APT.BaseData.Domain.Entities; -using APT.BaseData.Domain.Enums.PF; -using APT.BaseData.Domain.Enums; -using APT.BaseData.Domain.IServices.FM; -using APT.BaseData.Domain.IServices; -using APT.Infrastructure.Core; -using APT.MS.Domain.Entities.SK; -using APT.MS.Domain.Enums; -using APT.Utility; -using Microsoft.AspNetCore.Mvc; -using log4net.Core; -using APT.MS.Domain.Enums.SK; -using APT.MS.Domain.Entities.FO; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace APT.SK.WebApi.Controllers.Api -{ - /// - /// 辨识评估计划 - /// - [Route("api/SK/SKIdentifyEvaluationPlan")] - public partial class IdentifyEvaluationPlanController : AuthorizeApiController - { - IPFApproveCallBackService ApproveCallBackService { get; set; } - IFMNotificationTaskService NotificationTaskService { get; set; } - IPFCodeRuleService CodeRuleService { get; set; } - IFMFlowPermitService MFlowPermitService { get; set; } - public IdentifyEvaluationPlanController(IFMNotificationTaskService notificationTaskService, IFMFlowPermitService mFlowPermitService, IPFCodeRuleService codeRuleService, IPFApproveCallBackService approveCallBackService) - { - NotificationTaskService = notificationTaskService; - MFlowPermitService = mFlowPermitService; - CodeRuleService = codeRuleService; - ApproveCallBackService = approveCallBackService; - } - [HttpPost, Route("FullUpdate")] - public JsonActionResult FullUpdate([FromBody] T_SK_IDENTIFY_EVALUATION_PLAN entity) - { - return SafeExecute(() => - { - var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; - if (entity.APPLY_USER_ID == null) - entity.APPLY_USER_ID = userId; - if (entity.APPLY_DEPARTMENT_ID == null) - entity.APPLY_DEPARTMENT_ID = departId; - var details = entity.Nav_Details; - entity.Nav_Details = null; - var files = entity.Nav_Files; - entity.Nav_Files = null; - if (entity.START_DATE.Value.Date < DateTime.Now.Date) - { - throw new Exception("辨识开始时间必须大于今天"); - } - List deleteUserIds = new List(); - List deleteIds = new List(); - List userList = new List(); - var error1 = details.FirstOrDefault(t => t.DEPARTMENT_ID == null && !t.IS_DELETED); - if (error1 != null) - { - throw new Exception("辨识部门不能为空"); - } - var error2 = details.FirstOrDefault(t => t.Nav_DetailUsers == null && !t.IS_DELETED); - if (error2 != null) - { - throw new Exception("辨识人员不能为空"); - } - deleteIds = this.GetEntities(t => t.IDENTIFY_EVALUATION_PLAN_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); - deleteUserIds = this.GetEntities(t => deleteIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); - if (details != null && details.Where(t => !t.IS_DELETED).Any()) - { - foreach (var item in details.Where(t => !t.IS_DELETED).ToList()) - { - item.ORG_ID = entity.ORG_ID; - item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID; - if (item.Nav_DetailUsers != null && item.Nav_DetailUsers.Where(t => !t.IS_DELETED).Any()) - { - foreach (var item2 in item.Nav_DetailUsers.Where(t => !t.IS_DELETED).ToList()) - { - item2.ORG_ID = entity.ORG_ID; - item2.IDENTIFY_EVALUATION_PLAN_DETAIL_ID = item.ID; - item2.Nav_User = null; - userList.Add(item2); - } - } - item.Nav_DetailUsers = null; - } - } - if (files != null && files.Any()) - { - foreach (var item in files) - { - item.ORG_ID = entity.ORG_ID; - item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID; - item.Nav_ImgFile = null; - } - } - List notices = new List(); - if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) - { - var param = "其他"; - var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); - if (department != null) - { - if (department.DEPARTMENT_TYPE == 3 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 0)) - { param = "公司"; } - } - entity.STATUS = PFStandardStatus.Approving; - //取审批流水码 - var sysFilter = new SystemCodeFilter(); - sysFilter.CodeType = (int)PFCodeRuleType.审批流编码; - sysFilter.Count = 1; - sysFilter.OrgId = entity.ORG_ID; - var codes = CodeRuleService.NewGenSerial(sysFilter); - var serialCode = codes.Split(new char[] { ',' }); - MFlowPermitService.InsertApprove(serialCode[0], "SK031", param, entity.ID, "SK031_SHOWPRINT", entity.TaskID, true, () => - { - if (deleteUserIds != null && deleteUserIds.Any()) - this.BantchDeleteEntityNoCommit(deleteUserIds); - if (deleteIds != null && deleteIds.Any()) - this.BantchDeleteEntityNoCommit(deleteIds); - if (entity != null) - UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); - if (files != null && files.Any()) - BantchSaveEntityNoCommit(files); - if (userList != null && userList.Any()) - BantchSaveEntityNoCommit(userList); - }, null, null, null, null, null, "SK031_SHOWPRINT", null, "安全风险辨识与评估计划审批"); - return true; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Entities; +using APT.BaseData.Domain.Enums.PF; +using APT.BaseData.Domain.Enums; +using APT.BaseData.Domain.IServices.FM; +using APT.BaseData.Domain.IServices; +using APT.Infrastructure.Core; +using APT.MS.Domain.Entities.SK; +using APT.MS.Domain.Enums; +using APT.Utility; +using Microsoft.AspNetCore.Mvc; +using log4net.Core; +using APT.MS.Domain.Enums.SK; +using APT.MS.Domain.Entities.FO; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace APT.SK.WebApi.Controllers.Api +{ + /// + /// 辨识评估计划 + /// + [Route("api/SK/SKIdentifyEvaluationPlan")] + public partial class IdentifyEvaluationPlanController : AuthorizeApiController + { + IPFApproveCallBackService ApproveCallBackService { get; set; } + IFMNotificationTaskService NotificationTaskService { get; set; } + IPFCodeRuleService CodeRuleService { get; set; } + IFMFlowPermitService MFlowPermitService { get; set; } + public IdentifyEvaluationPlanController(IFMNotificationTaskService notificationTaskService, IFMFlowPermitService mFlowPermitService, IPFCodeRuleService codeRuleService, IPFApproveCallBackService approveCallBackService) + { + NotificationTaskService = notificationTaskService; + MFlowPermitService = mFlowPermitService; + CodeRuleService = codeRuleService; + ApproveCallBackService = approveCallBackService; + } + [HttpPost, Route("FullUpdate")] + public JsonActionResult FullUpdate([FromBody] T_SK_IDENTIFY_EVALUATION_PLAN entity) + { + return SafeExecute(() => + { + var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; + if (entity.APPLY_USER_ID == null) + entity.APPLY_USER_ID = userId; + if (entity.APPLY_DEPARTMENT_ID == null) + entity.APPLY_DEPARTMENT_ID = departId; + var details = entity.Nav_Details; + entity.Nav_Details = null; + var files = entity.Nav_Files; + entity.Nav_Files = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; + if (entity.START_DATE.Value.Date < DateTime.Now.Date) + { + throw new Exception("辨识开始时间必须大于今天"); + } + List deleteUserIds = new List(); + List deleteIds = new List(); + List userList = new List(); + var error1 = details.FirstOrDefault(t => t.DEPARTMENT_ID == null && !t.IS_DELETED); + if (error1 != null) + { + throw new Exception("辨识部门不能为空"); + } + var error2 = details.FirstOrDefault(t => t.Nav_DetailUsers == null && !t.IS_DELETED); + if (error2 != null) + { + throw new Exception("辨识人员不能为空"); + } + deleteIds = this.GetEntities(t => t.IDENTIFY_EVALUATION_PLAN_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deleteUserIds = this.GetEntities(t => deleteIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + if (details != null && details.Where(t => !t.IS_DELETED).Any()) + { + foreach (var item in details.Where(t => !t.IS_DELETED).ToList()) + { + item.ORG_ID = entity.ORG_ID; + item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID; + if (item.Nav_DetailUsers != null && item.Nav_DetailUsers.Where(t => !t.IS_DELETED).Any()) + { + foreach (var item2 in item.Nav_DetailUsers.Where(t => !t.IS_DELETED).ToList()) + { + item2.ORG_ID = entity.ORG_ID; + item2.IDENTIFY_EVALUATION_PLAN_DETAIL_ID = item.ID; + item2.Nav_User = null; + userList.Add(item2); + } + } + item.Nav_DetailUsers = null; + } + } + if (files != null && files.Any()) + { + foreach (var item in files) + { + item.ORG_ID = entity.ORG_ID; + item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID; + item.Nav_ImgFile = null; + } + } + List notices = new List(); + if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) + { + var param = "其他"; + var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); + if (department != null) + { + if (department.DEPARTMENT_TYPE == 3 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 0)) + { param = "公司"; } + } + entity.STATUS = PFStandardStatus.Approving; + //取审批流水码 + var sysFilter = new SystemCodeFilter(); + sysFilter.CodeType = (int)PFCodeRuleType.审批流编码; + sysFilter.Count = 1; + sysFilter.OrgId = entity.ORG_ID; + var codes = CodeRuleService.NewGenSerial(sysFilter); + var serialCode = codes.Split(new char[] { ',' }); + MFlowPermitService.InsertApprove(serialCode[0], "SK031", param, entity.ID, "SK031_SHOWPRINT", entity.TaskID, true, () => + { + if (deleteUserIds != null && deleteUserIds.Any()) + this.BantchDeleteEntityNoCommit(deleteUserIds); + if (deleteIds != null && deleteIds.Any()) + this.BantchDeleteEntityNoCommit(deleteIds); + if (entity != null) + UpdateEntityNoCommit(entity); + if (details != null && details.Any()) + BantchSaveEntityNoCommit(details); + if (files != null && files.Any()) + BantchSaveEntityNoCommit(files); + if (userList != null && userList.Any()) + BantchSaveEntityNoCommit(userList); + }, null, null, null, null, null, "SK031_SHOWPRINT", null, "安全风险辨识与评估计划审批"); + return true; } - this.UnifiedCommit(() => - { - if (deleteUserIds != null && deleteUserIds.Any()) - this.BantchDeleteEntityNoCommit(deleteUserIds); - if (deleteIds != null && deleteIds.Any()) - this.BantchDeleteEntityNoCommit(deleteIds); - if (entity != null) - UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); - if (files != null && files.Any()) - BantchSaveEntityNoCommit(files); - if (userList != null && userList.Any()) - BantchSaveEntityNoCommit(userList); - }); - return true; - }); - } - - /// - /// 获得单条实体数据 - /// - /// 过滤实体 - /// - [HttpPost, Route("SKGet")] - public JsonActionResult SKGet([FromBody] KeywordFilter filter) - { - return SafeExecute(() => - { - var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString(); - if (string.IsNullOrEmpty(id)) - this.ThrowError("060010"); - filter.IgnoreDataRule = true; - var result = this.GetEntity(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment", - "Nav_Files.Nav_ImgFile"}); - if (result != null) - { - var details = this.GetEntities(t => t.IDENTIFY_EVALUATION_PLAN_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Department"); - if (details.Any()) - { - var detailIds = details.Select(t => t.ID).ToList(); - var users = this.GetEntities(t => detailIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_User"); - foreach (var detail in details) - { - var userTemps = users.Where(t => t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID == detail.ID).ToList(); - detail.Nav_DetailUsers = userTemps; - } - } - result.Nav_Details = details.OrderBy(m => m.NUM).ToList(); - if (result.STATUS == PFStandardStatus.Rejected) - { - result.CONTEXT = ApproveCallBackService.RejectContent(result.ID); - } - } - return result; - }); - } - - /// - /// 回调函数 - /// - /// - /// - [HttpPost, Route("BackUpdateNew")] - public JsonActionResult BackUpdateNew([FromBody] T_PF_APPROVE entity) - { - return SafeExecute(() => - { - return ApproveCallBackService.CallBackNew("SK/SKIdentifyEvaluationPlan/BackUpdateNew", entity); - }); - } - /// - /// 驳回 - /// - /// - /// - [HttpPost, Route("RejectUpdate")] - public JsonActionResult RejectUpdate([FromBody] T_PF_APPROVE model) - { - return SafeExecute(() => - { - //公共 获取审批流信息 - T_PF_APPROVE modelApp = null; - List listAppDetail = null; - T_FM_NOTIFICATION_TASK taskFinish = null; - string Msg = string.Empty; - bool ResultGetInfo = ApproveCallBackService.GetApproject(model, ref modelApp, ref listAppDetail, ref taskFinish, ref Msg); - if (!ResultGetInfo) - throw new Exception("驳回失败！"); - if (modelApp == null || listAppDetail == null) - throw new Exception("获取驳回信息失败！"); - var entity = this.GetEntity(model.DATA_ID, new string[] { "Nav_ApplyUser" }); - entity.STATUS = PFStandardStatus.Rejected; - T_FM_NOTIFICATION_TASK notice = new T_FM_NOTIFICATION_TASK(); - if (entity.APPLY_USER_ID != null) - { - //发消息 - notice = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识与评估计划被驳回", entity.ID, entity.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now, - DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK031"); - } - UnifiedCommit(() => - { - if (entity != null) - this.UpdateEntityNoCommit(entity); - if (notice != null) - this.UpdateEntityNoCommit(notice); - if (modelApp != null) - UpdateEntityNoCommit(modelApp); - if (listAppDetail != null && listAppDetail.Count > 0) - BantchUpdateEntityNoCommit(listAppDetail); - if (taskFinish != null) - UpdateEntityNoCommit(taskFinish); - }); - return true; - //return ApproveCallBackService.CallReject("HM/HMLicenseAnalysis/RejectUpdate", id); - }); - } - } -} + this.UnifiedCommit(() => + { + if (deleteUserIds != null && deleteUserIds.Any()) + this.BantchDeleteEntityNoCommit(deleteUserIds); + if (deleteIds != null && deleteIds.Any()) + this.BantchDeleteEntityNoCommit(deleteIds); + if (entity != null) + UpdateEntityNoCommit(entity); + if (details != null && details.Any()) + BantchSaveEntityNoCommit(details); + if (files != null && files.Any()) + BantchSaveEntityNoCommit(files); + if (userList != null && userList.Any()) + BantchSaveEntityNoCommit(userList); + }); + return true; + }); + } + + /// + /// 获得单条实体数据 + /// + /// 过滤实体 + /// + [HttpPost, Route("SKGet")] + public JsonActionResult SKGet([FromBody] KeywordFilter filter) + { + return SafeExecute(() => + { + var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString(); + if (string.IsNullOrEmpty(id)) + this.ThrowError("060010"); + filter.IgnoreDataRule = true; + var result = this.GetEntity(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment", + "Nav_Files.Nav_ImgFile"}); + if (result != null) + { + var details = this.GetEntities(t => t.IDENTIFY_EVALUATION_PLAN_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Department"); + if (details.Any()) + { + var detailIds = details.Select(t => t.ID).ToList(); + var users = this.GetEntities(t => detailIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_User"); + foreach (var detail in details) + { + var userTemps = users.Where(t => t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID == detail.ID).ToList(); + detail.Nav_DetailUsers = userTemps; + } + } + result.Nav_Details = details.OrderBy(m => m.NUM).ToList(); + if (result.STATUS == PFStandardStatus.Rejected) + { + result.CONTEXT = ApproveCallBackService.RejectContent(result.ID); + } + } + return result; + }); + } + + /// + /// 回调函数 + /// + /// + /// + [HttpPost, Route("BackUpdateNew")] + public JsonActionResult BackUpdateNew([FromBody] T_PF_APPROVE entity) + { + return SafeExecute(() => + { + return ApproveCallBackService.CallBackNew("SK/SKIdentifyEvaluationPlan/BackUpdateNew", entity); + }); + } + /// + /// 驳回 + /// + /// + /// + [HttpPost, Route("RejectUpdate")] + public JsonActionResult RejectUpdate([FromBody] T_PF_APPROVE model) + { + return SafeExecute(() => + { + //公共 获取审批流信息 + T_PF_APPROVE modelApp = null; + List listAppDetail = null; + T_FM_NOTIFICATION_TASK taskFinish = null; + string Msg = string.Empty; + bool ResultGetInfo = ApproveCallBackService.GetApproject(model, ref modelApp, ref listAppDetail, ref taskFinish, ref Msg); + if (!ResultGetInfo) + throw new Exception("驳回失败！"); + if (modelApp == null || listAppDetail == null) + throw new Exception("获取驳回信息失败！"); + var entity = this.GetEntity(model.DATA_ID, new string[] { "Nav_ApplyUser" }); + entity.STATUS = PFStandardStatus.Rejected; + T_FM_NOTIFICATION_TASK notice = new T_FM_NOTIFICATION_TASK(); + if (entity.APPLY_USER_ID != null) + { + //发消息 + notice = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识与评估计划被驳回", entity.ID, entity.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now, + DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK031"); + } + UnifiedCommit(() => + { + if (entity != null) + this.UpdateEntityNoCommit(entity); + if (notice != null) + this.UpdateEntityNoCommit(notice); + if (modelApp != null) + UpdateEntityNoCommit(modelApp); + if (listAppDetail != null && listAppDetail.Count > 0) + BantchUpdateEntityNoCommit(listAppDetail); + if (taskFinish != null) + UpdateEntityNoCommit(taskFinish); + }); + return true; + //return ApproveCallBackService.CallReject("HM/HMLicenseAnalysis/RejectUpdate", id); + }); + } + } +} diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index 49d28b7..3dd9c15 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -50,7 +50,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_Details; entity.Nav_Details = null; var files = entity.Nav_Files; - entity.Nav_Files = null; + entity.Nav_Files = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteMeasureIds = new List(); List deleteDepartIds = new List(); List deletePostIds = new List(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs index 04f7664..861e637 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs @@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_Details; entity.Nav_Details = null; var files = entity.Nav_Files; - entity.Nav_Files = null; + entity.Nav_Files = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List measureList = new List(); List departList = new List(); List postList = new List(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index 2d8c2cd..da417a8 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -51,7 +51,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_Details; entity.Nav_Details = null; var files = entity.Nav_Files; - entity.Nav_Files = null; + entity.Nav_Files = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteMeasureIds = new List(); List deleteDetailIds = new List(); List measureList = new List(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs index 143bd4c..5a6abfc 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs @@ -50,7 +50,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_Details; entity.Nav_Details = null; var files = entity.Nav_Files; - entity.Nav_Files = null; + entity.Nav_Files = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteMeasureIds = new List(); List deleteDepartIds = new List(); List deletePostIds = new List(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs index d041600..c5cf68c 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs @@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_Details; entity.Nav_Details = null; var files = entity.Nav_Files; - entity.Nav_Files = null; + entity.Nav_Files = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteMeasureIds = new List(); List deleteDepartIds = new List(); List deletePostIds = new List(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index 89b0941..b2af9d3 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -129,6 +129,8 @@ namespace APT.SK.WebApi.Controllers.Api throw new Exception("检查类型不能为空"); if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue) throw new Exception("检查时间必须填写"); + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; var details = entity.Nav_CheckNoticeDetails; entity.Nav_CheckNoticeDetails = null; var files = entity.Nav_CheckNoticeFiles; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs index 1794686..1411f24 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs @@ -56,7 +56,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_CheckRecordDetails; entity.Nav_CheckRecordDetails = null; var files = entity.Nav_CheckRecordFiles; - entity.Nav_CheckRecordFiles = null; + entity.Nav_CheckRecordFiles = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteUserIds = new List(); List deleteFileIds = new List(); List deleteBasicIds = new List(); @@ -457,7 +459,9 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.CHECK_TYPE_ID == null) throw new Exception("检查类型不能为空"); if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue) - throw new Exception("检查时间必须填写"); + throw new Exception("检查时间必须填写"); + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; var details = entity.Nav_CheckRecordDetails; entity.Nav_CheckRecordDetails = null; var files = entity.Nav_CheckRecordFiles; @@ -649,7 +653,8 @@ namespace APT.SK.WebApi.Controllers.Api summary.SECURITY_INSPECTION_NOTICE_ID = notice != null ? notice.ID : null; summary.APPLY_DEPARTMENT_ID = notice != null ? notice.APPLY_DEPARTMENT_ID : entity.APPLY_DEPARTMENT_ID; summary.APPLY_USER_ID = notice != null ? notice.APPLY_USER_ID : entity.APPLY_USER_ID; - summary.MineType = notice != null ? notice.MineType : entity.MineType; + summary.MineType = notice != null ? notice.MineType : entity.MineType; + summary.PRODUCTION_UNIT_ID = notice != null ? notice.PRODUCTION_UNIT_ID : entity.PRODUCTION_UNIT_ID; summary.CHECK_TYPE_ID = notice != null ? notice.CHECK_TYPE_ID : entity.CHECK_TYPE_ID; summary.PLANCHECKFREQUENCY = notice != null ? notice.PLANCHECKFREQUENCY : entity.PLANCHECKFREQUENCY; summary.DEPARTMENT_TYPE = notice != null ? notice.DEPARTMENT_TYPE : entity.DEPARTMENT_TYPE; @@ -982,7 +987,8 @@ namespace APT.SK.WebApi.Controllers.Api report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = record.ID; report.APPLY_USER_ID = entity.APPLY_USER_ID; report.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID; - report.MineType = record.MineType; + report.MineType = record.MineType; + report.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; report.CHECK_TYPE_ID = record.CHECK_TYPE_ID; report.PLANCHECKFREQUENCY = record.PLANCHECKFREQUENCY; report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs index e128d4a..6054bf5 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs @@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api var details = entity.Nav_CheckRecordDetails; entity.Nav_CheckRecordDetails = null; var files = entity.Nav_CheckRecordFiles; - entity.Nav_CheckRecordFiles = null; + entity.Nav_CheckRecordFiles = null; + entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List userIds = new List(); List deleteUserIds = new List(); List deleteFileIds = new List(); @@ -190,6 +192,7 @@ namespace APT.SK.WebApi.Controllers.Api report.APPLY_USER_ID = entity.APPLY_USER_ID; report.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID; report.MineType = entity.MineType; + report.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; report.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; report.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY; report.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; @@ -358,7 +361,8 @@ namespace APT.SK.WebApi.Controllers.Api report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = record.ID; report.APPLY_USER_ID = record.APPLY_USER_ID; report.APPLY_DEPARTMENT_ID = record.APPLY_DEPARTMENT_ID; - report.MineType = record.MineType; + report.MineType = record.MineType; + report.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; report.CHECK_TYPE_ID = record.CHECK_TYPE_ID; report.PLANCHECKFREQUENCY = record.PLANCHECKFREQUENCY; report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE; @@ -506,7 +510,8 @@ namespace APT.SK.WebApi.Controllers.Api report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = record.ID; report.APPLY_USER_ID = record.APPLY_USER_ID; report.APPLY_DEPARTMENT_ID = record.APPLY_DEPARTMENT_ID; - report.MineType = record.MineType; + report.MineType = record.MineType; + report.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; report.CHECK_TYPE_ID = record.CHECK_TYPE_ID; report.PLANCHECKFREQUENCY = record.PLANCHECKFREQUENCY; report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE;