修改生产单元

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;
@@ -11417,6 +11418,7 @@ namespace APT.BaseData.Services.DomainServices
                             notice.APPLY_USER_ID = entity.APPLY_USER_ID;
                             notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
                             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;
@@ -11673,6 +11675,7 @@ namespace APT.BaseData.Services.DomainServices
                         record.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
                         record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
                         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;
@@ -11714,6 +11717,7 @@ namespace APT.BaseData.Services.DomainServices
                         notice.APPLY_USER_ID = entity.APPLY_USER_ID;
                         notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
                         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;
@@ -12305,6 +12309,7 @@ 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.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<Func<T_SK_RISK_IDENTIFY_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && identityIds.Contains(i.RISK_IDENTIFY_ID);
                         //List<T_SK_RISK_IDENTIFY_DETAIL> list = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID)).ToList();
                         var list = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(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<Func<T_SK_RISK_IDENTIFY_RESULT_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID);
                     //List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> details = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID), new string[] { "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts" }).ToList();
                     var details = GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(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.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.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<T_SK_RISK_EVALUATION_DETAIL>(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;
@@ -13476,6 +13485,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;
@@ -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;

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; }
         /// <summary>
         /// 辨识区域
         /// </summary>

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;
@@ -18,6 +19,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; }
         /// <summary>
         /// 检查内容
         /// </summary>

APT.MS.Domain/Entities/SK/T_SK_CHECK_SET.cs

@@ -18,6 +18,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
         [Description("组织结构")]
         [DataFieldForeignKey("Nav_Department")]
         public Guid? DEPARTMENT_ID { get; set; }

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;
@@ -53,5 +54,11 @@ 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; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM.cs

@@ -148,5 +148,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("驳回意见")]
         [DataFieldIngore]
         public string CONTEXT { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

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;
@@ -32,6 +33,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; }
         /// <summary>
         /// 辨识区域
         /// </summary>

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;
@@ -22,6 +23,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; }
         /// <summary>
         /// 辨识区域
         /// </summary>

APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART.cs

@@ -100,5 +100,13 @@ namespace APT.MS.Domain.Entities.SK
         [DataFieldIngore]
 
         public string DEPART_NAME { get; set; }
+
+        [DataFieldIngore]
+
+        public string MINE_NAME { get; set; }
+
+        [DataFieldIngore]
+
+        public Guid? PRODUCTION_UNIT_ID { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs

@@ -50,6 +50,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; }
         /// <summary>
         /// 检查区域
         /// </summary>
@@ -211,5 +217,12 @@ namespace APT.MS.Domain.Entities.SK
         /// </summary>
         [Description("导航：检查依据")]
         public virtual ICollection<T_SK_HIDDEN_DANGER_CONFIRM_BASIC> Nav_Basics { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_HAND_REPORT.cs

@@ -38,6 +38,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
         /// <summary>
         /// 检查区域
         /// </summary>
@@ -76,5 +82,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("是否发布")]
         [DataFieldIngore]
         public string PUBLISH { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY.cs

@@ -47,6 +47,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
         /// <summary>
         /// 延期整改理由
         /// </summary>
@@ -70,5 +76,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("驳回意见")]
         [DataFieldIngore]
         public string CONTEXT { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE.cs

@@ -53,6 +53,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
         /// <summary>
         /// 检查类型
         /// </summary>
@@ -132,5 +138,12 @@ namespace APT.MS.Domain.Entities.SK
         public string ImplementUser { get; set; }
         [Description("验收人")]
         public string AcceptUser { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs

@@ -79,6 +79,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
         /// <summary>
         /// 检查区域
         /// </summary>
@@ -266,5 +272,12 @@ namespace APT.MS.Domain.Entities.SK
 
         [Description("备注")]
         public string REMARK { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT.cs

@@ -38,6 +38,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; }
         /// <summary>
         /// 检查类型
         /// </summary>
@@ -101,5 +107,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("驳回意见")]
         [DataFieldIngore]
         public string CONTEXT { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN.cs

@@ -78,5 +78,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("驳回意见")]
         [DataFieldIngore]
         public string CONTEXT { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_PLAN_SET.cs

@@ -111,12 +111,18 @@ namespace APT.MS.Domain.Entities.SK
         public int ENABLE_STATUS { get; set; }
 
         /// <summary>
-        /// 检查范围
+        /// 生产单元
         /// </summary>
-        [Description("检查范围")]
+        [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; }
+
         /// <summary>
         /// 检查部门范围
         /// </summary>

APT.MS.Domain/Entities/SK/T_SK_RISK_AREA.cs

@@ -49,5 +49,11 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION.cs

@@ -74,5 +74,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("是否公司级")]
         [EnumName("SKIsStoreEnum")]
         public SKIsStoreEnum ISCOMPANY { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

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;
@@ -32,6 +33,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
 
         [Description("序号")]
         public int? NUM { get; set; }

APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY.cs

@@ -73,5 +73,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("是否公司级")]
         [EnumName("SKIsStoreEnum")]
         public SKIsStoreEnum ISCOMPANY { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

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;
@@ -32,6 +33,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
 
         [Description("序号")]
         public int? NUM { get; set; }

APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY.cs

@@ -79,5 +79,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("驳回意见")]
         [DataFieldIngore]
         public string CONTEXT { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

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;
@@ -32,6 +33,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
 
         [Description("序号")]
         public int? NUM { get; set; }

APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT.cs

@@ -90,5 +90,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("是否公司级")]
         [EnumName("SKIsStoreEnum")]
         public SKIsStoreEnum ISCOMPANY { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

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;
@@ -32,6 +33,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
 
         [Description("序号")]
         public int? NUM { get; set; }

APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY.cs

@@ -88,5 +88,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("是否公司级")]
         [EnumName("SKIsStoreEnum")]
         public SKIsStoreEnum ISCOMPANY { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

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;
@@ -31,6 +32,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
 
         [Description("序号")]
         public int? NUM { get; set; }

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;
@@ -32,5 +33,11 @@ namespace APT.MS.Domain.Entities.SK
         [FormFieldEdit]
         [EnumName("STATUSEnum")]
         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; }
     }
 }

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,7 +30,6 @@ namespace APT.MS.Domain.Entities.SK
 
         [Description("导航属性：发起部门")]
         public virtual T_FM_DEPARTMENT Nav_ApplyDepartment { get; set; }
-
         /// <summary>
         /// 生产单元
         /// </summary>
@@ -37,6 +37,12 @@ namespace APT.MS.Domain.Entities.SK
         [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; }
+
         /// <summary>
         /// 检查类型
         /// </summary>
@@ -99,5 +105,12 @@ namespace APT.MS.Domain.Entities.SK
         [Description("驳回意见")]
         [DataFieldIngore]
         public string CONTEXT { get; set; }
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD.cs

@@ -39,6 +39,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; }
         /// <summary>
         /// 检查类型
         /// </summary>
@@ -119,5 +125,12 @@ namespace APT.MS.Domain.Entities.SK
 
         [Description("导航属性：记录人")]
         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; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY.cs

@@ -41,6 +41,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; }
         /// <summary>
         /// 检查类型
         /// </summary>
@@ -100,5 +106,12 @@ namespace APT.MS.Domain.Entities.SK
         /// </summary>
         [Description("是否自动触发")]
         public bool ISAUTO { get; set; } = false;
+
+        [Description("发起人部门")]
+        [DataFieldLength(50)]
+        public string ApplyDepartmentName { get; set; }
+        [DataFieldLength(50)]
+        [Description("发起人岗位")]
+        public string ApplyPostName { get; set; }
     }
 }

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_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(filter.OrgId)).ToList();
+                var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && !t.CODE.Contains("admin"), new BaseFilter(filter.OrgId)).ToList();
                 foreach (var item in result.Data)
                 {
                     List<Guid> outPartmentIds = new List<Guid>();
@@ -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();
                             }
                         }
                     }

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 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.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 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.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();
@@ -1664,6 +1669,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                                                 ideDetail.ORG_ID = filter.OrgId;
                                                                 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;
@@ -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 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.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_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User");
                         var users = this.GetEntities<T_FM_USER>(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_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").ToList();
+                        var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_ProductionUnit").ToList();
                         var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
                         var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
                         var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(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;
@@ -4963,6 +4971,8 @@ 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.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;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs

@@ -55,6 +55,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 {
                     entity.APPLY_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
                 }
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> detailIds = new List<Guid>();
                 List<Guid> detailDepartIds = new List<Guid>();
                 List<Guid> detailPostIds = new List<Guid>();

APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs

@@ -53,6 +53,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_Files = null;
                 var basics = entity.Nav_Basics;
                 entity.Nav_Basics = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(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;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs

@@ -59,6 +59,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 var files = entity.Nav_ReportFiles;
                 entity.Nav_ReportFiles = null;
                 entity.Nav_RiskArea = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 if (files != null && files.Any())
                 {
                     foreach (var item in files)
@@ -87,6 +89,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID;
                         confirm.ORG_ID = entity.ORG_ID;
                         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;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs

@@ -41,6 +41,8 @@ namespace APT.SK.WebApi.Controllers.Api
                     entity.APPLY_USER_ID = userId;
                 if (entity.APPLY_DEPARTMENT_ID == null)
                     entity.APPLY_DEPARTMENT_ID = departId;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(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_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.ID == entity.HIDDEN_DANGER_RECTIFY_RECORD_ID);

APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs

@@ -49,6 +49,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_RectifyDetails = null;
                 var files = entity.Nav_RectifyFiles;
                 entity.Nav_RectifyFiles = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> deleteFileIds = new List<Guid>();
                 List<Guid> deleteBasicIds = new List<Guid>();
                 List<Guid> deleteDetailIds = new List<Guid>();
@@ -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;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs

@@ -48,6 +48,8 @@ namespace APT.SK.WebApi.Controllers
                     entity.APPLY_USER_ID = userId;
                 if (entity.APPLY_DEPARTMENT_ID == null)
                     entity.APPLY_DEPARTMENT_ID = departId;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(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;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs

@@ -61,6 +61,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_ReportDetails = null;
                 var files = entity.Nav_ReportFiles;
                 entity.Nav_ReportFiles = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
                 List<Guid> userIds = new List<Guid>();
                 List<Guid> deleteFileIds = new List<Guid>();

APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs

@@ -50,6 +50,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_Details = null;
                 var files = entity.Nav_Files;
                 entity.Nav_Files = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(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("辨识开始时间必须大于今天");

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs

@@ -51,6 +51,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_Details = null;
                 var files = entity.Nav_Files;
                 entity.Nav_Files = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> deleteMeasureIds = new List<Guid>();
                 List<Guid> deleteDepartIds = new List<Guid>();
                 List<Guid> deletePostIds = new List<Guid>();

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs

@@ -49,6 +49,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_Details = null;
                 var files = entity.Nav_Files;
                 entity.Nav_Files = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>();
                 List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART> departList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>();
                 List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST> postList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>();

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs

@@ -52,6 +52,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_Details = null;
                 var files = entity.Nav_Files;
                 entity.Nav_Files = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> deleteMeasureIds = new List<Guid>();
                 List<Guid> deleteDetailIds = new List<Guid>();
                 List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>();

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs

@@ -51,6 +51,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_Details = null;
                 var files = entity.Nav_Files;
                 entity.Nav_Files = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> deleteMeasureIds = new List<Guid>();
                 List<Guid> deleteDepartIds = new List<Guid>();
                 List<Guid> deletePostIds = new List<Guid>();

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs

@@ -49,6 +49,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_Details = null;
                 var files = entity.Nav_Files;
                 entity.Nav_Files = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> deleteMeasureIds = new List<Guid>();
                 List<Guid> deleteDepartIds = new List<Guid>();
                 List<Guid> deletePostIds = new List<Guid>();

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_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(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;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs

@@ -57,6 +57,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_CheckRecordDetails = null;
                 var files = entity.Nav_CheckRecordFiles;
                 entity.Nav_CheckRecordFiles = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> deleteUserIds = new List<Guid>();
                 List<Guid> deleteFileIds = new List<Guid>();
                 List<Guid> deleteBasicIds = new List<Guid>();
@@ -458,6 +460,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_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(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;
@@ -650,6 +654,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                 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.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;
@@ -983,6 +988,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 = 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;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs

@@ -49,6 +49,8 @@ namespace APT.SK.WebApi.Controllers.Api
                 entity.Nav_CheckRecordDetails = null;
                 var files = entity.Nav_CheckRecordFiles;
                 entity.Nav_CheckRecordFiles = null;
+                entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
+                entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
                 List<Guid> userIds = new List<Guid>();
                 List<Guid> deleteUserIds = new List<Guid>();
                 List<Guid> deleteFileIds = new List<Guid>();
@@ -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;
@@ -359,6 +362,7 @@ namespace APT.SK.WebApi.Controllers.Api
                             report.APPLY_USER_ID = record.APPLY_USER_ID;
                             report.APPLY_DEPARTMENT_ID = record.APPLY_DEPARTMENT_ID;
                             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;
@@ -507,6 +511,7 @@ namespace APT.SK.WebApi.Controllers.Api
                             report.APPLY_USER_ID = record.APPLY_USER_ID;
                             report.APPLY_DEPARTMENT_ID = record.APPLY_DEPARTMENT_ID;
                             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;