Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

APT.Data.Migrations/Migrations/20251023121339_hmr2025102304.cs

@@ -0,0 +1,79 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2025102304 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "HIDDEN_REASON",
+                table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL",
+                type: "nvarchar(200)",
+                maxLength: 200,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "HIDDEN_REASON",
+                table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL",
+                type: "nvarchar(200)",
+                maxLength: 200,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL",
+                type: "nvarchar(200)",
+                maxLength: 200,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
+                type: "nvarchar(200)",
+                maxLength: 200,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL",
+                type: "nvarchar(200)",
+                maxLength: 200,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_CONFIRM",
+                type: "nvarchar(200)",
+                maxLength: 200,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "HIDDEN_REASON",
+                table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "HIDDEN_REASON",
+                table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD");
+
+            migrationBuilder.DropColumn(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "HIDDEN_REASON",
+                table: "T_SK_HIDDEN_DANGER_CONFIRM");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -75684,6 +75684,10 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<string>("HIDDEN_REASON")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
                     b.Property<bool>("IS_DELETED")
                         .HasColumnType("bit");
 
@@ -76373,6 +76377,10 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<string>("HIDDEN_REASON")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
                     b.Property<Guid?>("IMPLEMENT_USER_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -76712,6 +76720,10 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<string>("HIDDEN_REASON")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
                     b.Property<Guid?>("IMPLEMENT_USER_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -77186,6 +77198,10 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<string>("HIDDEN_REASON")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
                     b.Property<bool>("ISCHECK")
                         .HasColumnType("bit");
 
@@ -82337,6 +82353,10 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<string>("HIDDEN_REASON")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
                     b.Property<bool>("IS_DELETED")
                         .HasColumnType("bit");
 
@@ -82776,6 +82796,10 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<string>("HIDDEN_REASON")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
                     b.Property<bool>("IS_DELETED")
                         .HasColumnType("bit");
 

APT.MS.Data/Mapping/T4/T4Map.cs

@@ -12933,6 +12933,7 @@ builder.Ignore(t => t.PUBLISH);
 builder.Ignore(t => t.CONTEXT);
 builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
 builder.Property(t => t.ApplyPostName).HasMaxLength(50);
+builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
 		} 
      }
 	 #endregion
@@ -13064,6 +13065,7 @@ builder.Property(t => t.RECTIFICATION_MEASURES).HasMaxLength(500);
 builder.HasOne(t => t.Nav_ImplementUser).WithMany().HasForeignKey(t => t.IMPLEMENT_USER_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_AcceptUser).WithMany().HasForeignKey(t => t.ACCEPT_USER_ID).OnDelete(DeleteBehavior.Restrict);
 builder.Ignore(t => t.Nav_DetailContents);
+builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
 		} 
      }
 	 #endregion
@@ -13133,6 +13135,7 @@ builder.Ignore(t => t.CONTEXT);
 builder.Property(t => t.REMARK).HasMaxLength(500);
 builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
 builder.Property(t => t.ApplyPostName).HasMaxLength(50);
+builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
 		} 
      }
 	 #endregion
@@ -13218,6 +13221,7 @@ builder.Property(t => t.CHECK_PERSON).HasMaxLength(500);
 builder.HasOne(t => t.Nav_RecitifyUser).WithMany().HasForeignKey(t => t.RECITIFY_USER_ID).OnDelete(DeleteBehavior.Restrict);
 builder.Ignore(t => t.STATUS);
 builder.Ignore(t => t.Nav_DetailContents);
+builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
 		} 
      }
 	 #endregion
@@ -14207,6 +14211,7 @@ builder.HasOne(t => t.Nav_Question).WithMany().HasForeignKey(t => t.CHECK_QUESTI
 builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
 builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
 builder.Ignore(t => t.Nav_DetailContents);
+builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
 		} 
      }
 	 #endregion
@@ -14287,6 +14292,7 @@ builder.HasOne(t => t.Nav_Question).WithMany().HasForeignKey(t => t.CHECK_QUESTI
 builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
 builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
 builder.Ignore(t => t.Nav_DetailContents);
+builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
 		} 
      }
 	 #endregion

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

@@ -223,6 +223,13 @@ namespace APT.MS.Domain.Entities.SK
         public string ApplyDepartmentName { get; set; }
         [DataFieldLength(50)]
         [Description("发起人岗位")]
-        public string ApplyPostName { get; set; }
+        public string ApplyPostName { get; set; }
+
+        /// <summary>
+        /// 隐患原因
+        /// </summary>
+        [Description("隐患原因")]
+        [DataFieldLength(200)]
+        public string HIDDEN_REASON { get; set; }
     }
 }

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

@@ -168,6 +168,13 @@ namespace APT.MS.Domain.Entities.SK
         /// 导航属性：检查依据
         /// </summary>
         [Description("导航：检查依据")]
-        public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC> Nav_RectifyDetailBasics { get; set; }
+        public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC> Nav_RectifyDetailBasics { get; set; }
+
+        /// <summary>
+        /// 隐患原因
+        /// </summary>
+        [Description("隐患原因")]
+        [DataFieldLength(200)]
+        public string HIDDEN_REASON { get; set; }
     }
 }

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

@@ -278,6 +278,13 @@ namespace APT.MS.Domain.Entities.SK
         public string ApplyDepartmentName { get; set; }
         [DataFieldLength(50)]
         [Description("发起人岗位")]
-        public string ApplyPostName { get; set; }
+        public string ApplyPostName { get; set; }
+
+        /// <summary>
+        /// 隐患原因
+        /// </summary>
+        [Description("隐患原因")]
+        [DataFieldLength(200)]
+        public string HIDDEN_REASON { get; set; }
     }
 }

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

@@ -163,6 +163,13 @@ namespace APT.MS.Domain.Entities.SK
         public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL> Nav_DetailContents { get; set; }
 
         [Description("导航：检查依据")]
-        public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> Nav_ReportDetailBasics { get; set; }
+        public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> Nav_ReportDetailBasics { get; set; }
+
+        /// <summary>
+        /// 隐患原因
+        /// </summary>
+        [Description("隐患原因")]
+        [DataFieldLength(200)]
+        public string HIDDEN_REASON { get; set; }
     }
 }

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

@@ -144,6 +144,13 @@ namespace APT.MS.Domain.Entities.SK
         /// 顺序
         /// </summary>
         [Description("顺序")]
-        public int? NUM { get; set; }
+        public int? NUM { get; set; }
+
+        /// <summary>
+        /// 隐患原因
+        /// </summary>
+        [Description("隐患原因")]
+        [DataFieldLength(200)]
+        public string HIDDEN_REASON { get; set; }
     }
 }

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

@@ -138,6 +138,13 @@ namespace APT.MS.Domain.Entities.SK
         /// 顺序
         /// </summary>
         [Description("顺序")]
-        public int? NUM { get; set; }
+        public int? NUM { get; set; }
+
+        /// <summary>
+        /// 隐患原因
+        /// </summary>
+        [Description("隐患原因")]
+        [DataFieldLength(200)]
+        public string HIDDEN_REASON { get; set; }
     }
 }

APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs

@@ -355,6 +355,32 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                     result.Data = null;
             }
             return result;
+        }
+        /// <summary>
+        /// 除车间级班组级向下查询，其他层级查所有人
+        /// </summary>
+        /// <param name="pageFilter"></param>
+        /// <returns></returns>
+        [HttpPost, Route("OrderPagedWithLevel")]
+        public PagedActionResult<T_FM_USER> OrderPagedWithLevel([FromBody] KeywordPageFilter pageFilter)
+        {
+            return SafeGetPagedData<T_FM_USER>((ret) =>
+            {
+                var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentId;
+                var departIdType = this.GetEntity<T_FM_DEPARTMENT>(departId.ToString())?.DEPARTMENT_TYPE;
+                Expression<Func<T_FM_USER, bool>> express = t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin");
+                if (departIdType != null && (departIdType == 15 || departIdType == 20))
+                {
+                    List<Guid> departmentId = new List<Guid>();
+                    departmentId.Add(Guid.Parse(departId.ToString()));
+                    List<Guid> departmentIds = new List<Guid>() { APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value };
+                    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+                    express = express.And(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID));
+                }
+                var result = this.GetOrderPageEntities<T_FM_USER>(express, pageFilter);
+                ret.TotalCount = result.TotalCount;
+                ret.Data = result.Data;
+            });
         }
         /// <summary>
         /// 重写用户查询接口

APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs

@@ -662,6 +662,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                             detail.CHECKPROOF = item2.CHECKPROOF;
                                             detail.CHECKSTANDARD = item2.CHECKSTANDARD;
                                             detail.NUM = i;
+                                            detail.CHECK_RESULT = SKCheckResultEnum.None;
                                             recordDetails.Add(detail);
                                             if (item2.Nav_CheckNoticeDetailUsers != null && item2.Nav_CheckNoticeDetailUsers.Any())
                                             {

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

@@ -108,9 +108,16 @@ namespace APT.SK.WebApi.Controllers.Api
                     var level = (param == "Major" || param == "重大") ? "重大" : "一般";
                     if (hiddenLevel == SKHiddenLevel.General)
                     {
-                        var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
+                        var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
                         //level = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
-                        level = ((SKDepartmentTypeEnum)departmentType).GetDescription();
+                        if (departmentType != null)
+                        {
+                            level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
+                            if (departmentType.DEPARTMENT_STATUS != 1)
+                            {
+                                level = "公司级";
+                            }
+                        }
                     }
                     //触发审批
                     entity.STATUS = PFStandardStatus.Approving;

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

@@ -177,9 +177,16 @@ namespace APT.SK.WebApi.Controllers
                             var level = param == "Major" ? "重大" : "一般";
                             if (entity.HIDDEN_LEVEL == SKHiddenLevel.General)
                             {
-                                var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
+                                var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
                                 //param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
-                                param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
+                                if (departmentType != null)
+                                {
+                                    param = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
+                                    if (departmentType.DEPARTMENT_STATUS != 1)
+                                    {
+                                        param = "公司级";
+                                    }
+                                }
                             }
                             MFlowPermitService.InsertApprove(serialCode[0], "SK022", param, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () =>
                             {

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

@@ -188,9 +188,16 @@ namespace APT.SK.WebApi.Controllers.Api
                         var level = param == "Major" ? "重大" : "一般";
                         if (hiddenLevel == SKHiddenLevel.General)
                         {
-                            var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
+                            var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
                             //param = Enum.GetName(typeof(FMDepartmentType), departmentType);
-                            param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
+                            if (departmentType != null)
+                            {
+                                param = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
+                                if (departmentType.DEPARTMENT_STATUS != 1)
+                                {
+                                    param = "公司级";
+                                }
+                            }
                         }
                         MFlowPermitService.InsertApprove(serialCode[0], "SK014", param, entity.ID, "SK014_SHOWPRINT", entity.TaskID, true, () =>
                         {

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

@@ -226,6 +226,10 @@ namespace APT.SK.WebApi.Controllers.Api
                     if (department != null)
                     {
                         param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE);
+                        if (department.DEPARTMENT_STATUS != 1)
+                        {
+                            param = "公司级";
+                        }
                     }
                     var date = DateTime.Now.Year + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0');
                     entity.STATUS = PFStandardStatus.Approving;
@@ -496,36 +500,16 @@ namespace APT.SK.WebApi.Controllers.Api
 
             var result = new JsonActionResult<List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>>();
             var dataList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
-            if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3))
+            if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3) && !string.IsNullOrEmpty(filter.Parameter4))
             {
-                var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
-                var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
-                if (personId == null)
-                    throw new Exception("用户数据异常，请联系管理员排查");
-                var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
-                if (postId == null)
-                    throw new Exception("请先维护登陆人岗位");
-                var mineType = FMProductionUnit.Mine;
-                if (filter.Parameter1 == "30")
-                {
-                    mineType = FMProductionUnit.Mine;
-                }
-                else if (filter.Parameter1 == "10")
-                {
-                    mineType = FMProductionUnit.MineChoose;
-                }
-                else if (filter.Parameter1 == "20")
-                {
-                    mineType = FMProductionUnit.Minelast;
-                }
-                else if (filter.Parameter1 == "0")
-                {
-                    mineType = FMProductionUnit.All;
-                }
-                else
-                {
-                    throw new Exception("生产单元错误");
-                }
+                var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
+                var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
+                //var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
+                //if (personId == null)
+                //    throw new Exception("用户数据异常，请联系管理员排查");
+                //var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
+                //if (postId == null)
+                //    throw new Exception("请先维护登陆人岗位");
                 var departType = SKDepartmentTypeEnum.部门级;
                 if (filter.Parameter3 == "0")
                 {
@@ -550,21 +534,51 @@ namespace APT.SK.WebApi.Controllers.Api
                 else
                 {
                     throw new Exception("检查层级错误");
+                }
+                var cycle = SKPLANCHECKFREQUENCYEnum.Date;
+                if (filter.Parameter4 == "20")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Week;
                 }
-                var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => t.POST_ID == postId, new BaseFilter(filter.OrgId));
-                var departIds = posts.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).ToList();
-                var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => departIds.Contains(t.ID) && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType, new BaseFilter(filter.OrgId));
-                var contentIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
-                var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => contentIds.Contains(t.ID), new BaseFilter(filter.OrgId), new string[] {"Nav_Contents","Nav_LibraryDetail",
-                    "Nav_LibraryDetail.Nav_Library.Nav_Area"});
+                else if (filter.Parameter4 == "30")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Month;
+                }
+                else if (filter.Parameter4 == "40")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Quarter;
+                }
+                else if (filter.Parameter4 == "50")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.HalfYear;
+                }
+                else if (filter.Parameter4 == "60")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Year;
+                }
+                else
+                {
+                    throw new Exception("检查周期错误");
+                }
+                var libs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Parameter1), new BaseFilter(filter.OrgId),"Nav_Area").ToList();
+                var libIds = libs.Select(m=>m.ID).ToList();
+                var details = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
+                var detailIds = details.Select(m => m.ID).ToList();
+                var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
+                var contentIds = contents.Select(m=>m.ID).ToList();
+                var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID) &&  t.DEPARTMENT_ID == departId && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType && t.CHECK_CYCLE == cycle, new BaseFilter(filter.OrgId));
+                var contentDepIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
+                var libraryContents = contents.Where(t => contentDepIds.Contains(t.ID)).ToList();
                 if (libraryContents != null && libraryContents.Any())
                 {
                     foreach (var item in libraryContents)
                     {
+                        var detailFist = details.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_ID);
+                        var libFirst= libs.FirstOrDefault(t => t.ID == detailFist?.ENTERPRISE_LIBRARY_ID);
                         T_SK_SECURITY_INSPECTION_NOTICE_DETAIL detail = new T_SK_SECURITY_INSPECTION_NOTICE_DETAIL();
                         detail.ORG_ID = filter.OrgId;
-                        detail.RISK_AREA_ID = item.Nav_LibraryDetail?.Nav_Library?.AREA_ID;
-                        detail.Nav_RiskArea = item.Nav_LibraryDetail?.Nav_Library?.Nav_Area;
+                        detail.RISK_AREA_ID = libFirst?.AREA_ID;
+                        detail.Nav_RiskArea = libFirst?.Nav_Area;
                         detail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
                         detail.Nav_Contents = item.Nav_Contents;
                         detail.CHECKCONTENT = item.CHECK_CONTENT;
@@ -592,15 +606,16 @@ namespace APT.SK.WebApi.Controllers.Api
 
             var result = new JsonActionResult<List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>>();
             var dataList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
-            if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3))
+            if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3) && !string.IsNullOrEmpty(filter.Parameter4))
             {
-                var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
-                var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
-                if (personId == null)
-                    throw new Exception("用户数据异常，请联系管理员排查");
-                var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
-                if (postId == null)
-                    throw new Exception("请先维护登陆人岗位");
+                var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
+                var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
+                //var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
+                //if (personId == null)
+                //    throw new Exception("用户数据异常，请联系管理员排查");
+                //var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
+                //if (postId == null)
+                //    throw new Exception("请先维护登陆人岗位");
                 //var mineType = SKProductionUnit.Mine;
                 //if (filter.Parameter1 == "30")
                 //{
@@ -658,13 +673,41 @@ namespace APT.SK.WebApi.Controllers.Api
                 else
                 {
                     throw new Exception("检查层级错误");
+                }
+                var cycle = SKPLANCHECKFREQUENCYEnum.Date;
+                if (filter.Parameter4 == "20")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Week;
                 }
-                var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => t.POST_ID == postId, new BaseFilter(filter.OrgId));
-                var departIds = posts.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).ToList();
-                var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => departIds.Contains(t.ID) && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType, new BaseFilter(filter.OrgId));
-                var contentIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
-                var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => contentIds.Contains(t.ID), new BaseFilter(filter.OrgId), new string[] {"Nav_Contents","Nav_LibraryDetail",
-                    "Nav_LibraryDetail.Nav_Library.Nav_Area"});
+                else if (filter.Parameter4 == "30")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Month;
+                }
+                else if (filter.Parameter4 == "40")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Quarter;
+                }
+                else if (filter.Parameter4 == "50")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.HalfYear;
+                }
+                else if (filter.Parameter4 == "60")
+                {
+                    cycle = SKPLANCHECKFREQUENCYEnum.Year;
+                }
+                else
+                {
+                    throw new Exception("检查周期错误");
+                }
+                var libs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Parameter1), new BaseFilter(filter.OrgId), "Nav_Area").ToList();
+                var libIds = libs.Select(m => m.ID).ToList();
+                var details = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
+                var detailIds = details.Select(m => m.ID).ToList();
+                var libContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
+                var contentIds = libContents.Select(m => m.ID).ToList();
+                var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID) && t.DEPARTMENT_ID == departId && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType && t.CHECK_CYCLE == cycle, new BaseFilter(filter.OrgId));
+                var contentDepIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
+                var libraryContents = libContents.Where(t => contentDepIds.Contains(t.ID)).ToList();
                 if (libraryContents != null && libraryContents.Any())
                 {
                     foreach (var item in libraryContents)