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

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

@@ -3,6 +3,7 @@ using APT.MS.Domain.Entities.LR;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 
 namespace APT.MS.Domain.Entities.SK
@@ -21,6 +22,7 @@ namespace APT.MS.Domain.Entities.SK
         /// 检查内容
         /// </summary>
         [Description("检查内容")]
+        [NotMapped]
         public virtual T_SK_CHECK_CONTENTS Nav_Contents { get; set; }
 
         /// <summary>
@@ -34,6 +36,7 @@ namespace APT.MS.Domain.Entities.SK
         /// 导航属性：法律法规库
         /// </summary>
         [Description("导航属性：法律法规库")]
+        [NotMapped]
         public T_LR_LAW Nav_Law { get; set; }
     }
 }

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

@@ -5413,12 +5413,12 @@ namespace APT.PP.WebApi.Controllers.Api
                                     foreach (var user in userInfo)
                                     {
                                         //判断是否重复触发
-                                        var exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == user.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME.Value.Date == dt.Date);
+                                        var exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == user.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME.Value.Date == dt.Date && t.ISAUTO == true);
                                         //如果是大夜班，跨天的情况下再判断一次，如果存在，就表示今天已触发，只是创建日期是昨天
                                         if (exist == null && sche != null && sche.START_TIME.AddHours(-1).Date != dt.Date)
                                         {
                                             var tempDate = sche.START_TIME.AddHours(-2);
-                                            exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == user.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME > tempDate);
+                                            exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == user.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME > tempDate && t.ISAUTO == true);
                                         }
                                         if (exist == null)
                                         {
@@ -5516,7 +5516,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                 {
                                     var setTime = setList.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.CHECK_CYCLE == item.Cycle);
                                     //判断是否重复触发
-                                    var exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME.Value.Date == dt.Date);
+                                    var exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME.Value.Date == dt.Date && t.ISAUTO == true);
                                     //如果是大夜班，跨天的情况下再判断一次，如果存在，就表示今天已触发，只是创建日期是昨天
                                     if (exist == null && item.CheckPost == "班组负责人")
                                     {
@@ -5526,7 +5526,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                         if (sche != null && sche.START_TIME.AddHours(-1).Date != dt.Date)
                                         {
                                             var tempDate = sche.START_TIME.AddHours(-2);
-                                            exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME > tempDate);
+                                            exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME > tempDate && t.ISAUTO == true);
                                         }
                                     }
                                     if ((exist == null && item.CheckPost == "班组负责人") || (exist == null && item.CheckPost != "班组负责人" && setTime != null && dtNow.Hour == setTime.CHECKTIME.Value.Hour))

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

@@ -160,6 +160,9 @@ namespace APT.SK.WebApi.Controllers
                     enterpriseLib.EVALUATE_L = entity.EVALUATE_L;
                     enterpriseLib.EVALUATE_E = entity.EVALUATE_E;
                     enterpriseLib.EVALUATE_C = entity.EVALUATE_C;
+                    enterpriseLib.SCOREL_ID = entity.SCOREL_ID;
+                    enterpriseLib.SCOREE_ID = entity.SCOREE_ID;
+                    enterpriseLib.SCOREC_ID = entity.SCOREC_ID;
                     enterpriseLib.EVALUATE_SCORE = entity.EVALUATE_SCORE;
                     enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL;
                     enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
@@ -706,6 +709,9 @@ namespace APT.SK.WebApi.Controllers
                     enterpriseLib.EVALUATE_L = entity.EVALUATE_L;
                     enterpriseLib.EVALUATE_E = entity.EVALUATE_E;
                     enterpriseLib.EVALUATE_C = entity.EVALUATE_C;
+                    enterpriseLib.SCOREL_ID = entity.SCOREL_ID;
+                    enterpriseLib.SCOREE_ID = entity.SCOREE_ID;
+                    enterpriseLib.SCOREC_ID = entity.SCOREC_ID;
                     enterpriseLib.EVALUATE_SCORE = entity.EVALUATE_SCORE;
                     enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL;
                     enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
@@ -1710,10 +1716,13 @@ namespace APT.SK.WebApi.Controllers
                 //查检查依据(法律法规)
                 List<T_LR_LAW> updateCheckLaws = new List<T_LR_LAW>();
                 List<T_LR_LAW_TYPE> updateCheckLawTypes = new List<T_LR_LAW_TYPE>();
-                var checkContLaws = this.GetEntities<T_LR_LAW>(t => true, new BaseFilter(orgId));
+                List<T_SK_CHECK_CONTENTS_BASIC> updateCheckBas = new List<T_SK_CHECK_CONTENTS_BASIC>();
-                var jtcheckContLaws = db.GetJTLaws(dbName).ToList();
                 var jtcheckContLawTypes = db.GetJTLawTypes(dbName).ToList();
                 var checkContLawTypes = this.GetEntities<T_LR_LAW_TYPE>(t => true, new BaseFilter(orgId));
+                var checkContLaws = this.GetEntities<T_LR_LAW>(t => true, new BaseFilter(orgId));
+                var jtcheckContLaws = db.GetJTLaws(dbName).ToList();
+                var checkContBas = this.GetEntities<T_SK_CHECK_CONTENTS_BASIC>(t => true, new BaseFilter(orgId));
+                var jtcheckContBas = db.GetJTBas(dbName).ToList();
                 if (basicList != null && basicList.Any())
                 {
                     var conIds = basicList.Select(t => t.LAW_ID).Distinct().ToList();
@@ -1822,6 +1831,39 @@ namespace APT.SK.WebApi.Controllers
                             }
                         }
                     }
+                    //检查内容子表保存
+                    var conBasics = basicList.GroupBy(t => new { t.CHECK_CONTENTS_ID, t.LAW_ID }).ToList();
+                    if (conBasics != null && conBasics.Any())
+                    {
+                        foreach (var item in conBasics)
+                        {
+                            var first = checkContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
+                            if (first == null)
+                            {
+                                //写入
+                                var jtFirstType = jtcheckContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
+                                if (jtFirstType != null)
+                                {
+                                    T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
+                                    conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
+                                    conBasic.LAW_ID = item.Key.LAW_ID;
+                                    conBasic.ORG_ID = orgId;
+                                    conBasic.ID = jtFirstType.ID;
+                                    updateCheckBas.Add(conBasic);
+                                }
+                            }
+                            else
+                            {
+                                //更新
+                                T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
+                                conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
+                                conBasic.LAW_ID = item.Key.LAW_ID;
+                                conBasic.ORG_ID = orgId;
+                                conBasic.ID = first.ID;
+                                updateCheckBas.Add(conBasic);
+                            }
+                        }
+                    }
                 }
                 //查隐患描述
                 List<T_SK_CHECK_QUESTION> updateCheckQues = new List<T_SK_CHECK_QUESTION>();
@@ -1893,6 +1935,8 @@ namespace APT.SK.WebApi.Controllers
                         BantchSaveEntityNoCommit(updateCheckConts);
                     if (updateCheckQues != null && updateCheckQues.Any())
                         BantchSaveEntityNoCommit(updateCheckQues);
+                    if (updateCheckBas != null && updateCheckBas.Any())
+                        BantchSaveEntityNoCommit(updateCheckBas);
                     if (deleteBasBasicIds != null && deleteBasBasicIds.Any())
                         this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC>(deleteBasBasicIds);
                     if (deleteBasHiddenIds != null && deleteBasHiddenIds.Any())

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

@@ -74,6 +74,9 @@ namespace APT.SK.WebApi.Controllers.Api
             modelBuilder.Entity<T_SK_CHECK_QUESTION>().Ignore(x => x.Nav_Org)
                    .Ignore(x => x.DbConn)
                    .Ignore(x => x.TaskID);
+            modelBuilder.Entity<T_SK_CHECK_CONTENTS_BASIC>().Ignore(x => x.Nav_Org)
+                  .Ignore(x => x.DbConn)
+                  .Ignore(x => x.TaskID);
             //modelBuilder.Entity<OrgRuleDeptCheck>()
             //        .Ignore(x => x.departmentCheckedKeys);
         }
@@ -210,5 +213,11 @@ namespace APT.SK.WebApi.Controllers.Api
             var ques = this.Set<T_SK_CHECK_QUESTION>().FromSqlRaw(sql).ToList();
             return ques;
         }
+        public List<T_SK_CHECK_CONTENTS_BASIC> GetJTBas(string dbName)
+        {
+            string sql = $"SELECT * FROM {dbName}.dbo.T_SK_CHECK_CONTENTS_BASIC";
+            var ques = this.Set<T_SK_CHECK_CONTENTS_BASIC>().FromSqlRaw(sql).ToList();
+            return ques;
+        }
     }
 }