检查登记 限制去除 修改对应属性接口和入参

完善 手动新增登记的方法

APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs

@@ -8072,6 +8072,22 @@ namespace APT.BS.WebApi.Controllers.Api
                         }
                     }
                 }
+                if (listMineType.Count() == 0 && pageFilter.FilterGroup.Rules != null && pageFilter.FilterGroup.Rules.Any())
+                {
+                    foreach (var item in pageFilter.FilterGroup.Rules)
+                    {
+                        if (item.Field == "CHECKOBJECT")
+                        {
+                            try
+                            {
+                                listMineType.Add(int.Parse(item.Value.ToString()));
+                                pageFilter.FilterGroup.Rules.Remove(item);
+                            }
+                            catch { }
+                            break;
+                        }
+                    }
+                }
 
                 if (listMineType == null)
                 {
@@ -8117,6 +8133,15 @@ namespace APT.BS.WebApi.Controllers.Api
         [HttpPost, Route("AddCheckRecord")]
         public JsonActionResult<bool> AddCheckRecord([FromBody] ModelSafeCheckRecordAdd entity)
         {
+            IEnumerable<T_BS_SAFE_CHECK_PROJECT> listCheakProject = null;
+            IEnumerable<T_BS_SAFE_CHECK_RISK_AREA> listCheakArea = null;
+            IEnumerable<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategory = null;
+            if (entity.SAFE_CHECK_ID != Guid.Empty)
+            {
+                listCheakProject = GetEntities<T_BS_SAFE_CHECK_PROJECT>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
+                listCheakArea = GetEntities<T_BS_SAFE_CHECK_RISK_AREA>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
+                listCheakCategory = GetEntities<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
+            }
             return SafeExecute(() =>
             {
                 if (entity.SAFE_CHECK_ID == Guid.Empty)
@@ -8177,6 +8202,13 @@ namespace APT.BS.WebApi.Controllers.Api
 
                 T_BS_CHECK_MAIN modelMain = null;
                 int NUM = 0;
+
+
+
+                T_BS_SAFE_CHECK_RISK_AREA cheakAreaAdd = null;
+                List<T_BS_SAFE_CHECK_PROJECT> listCheakProjectAdd = new List<T_BS_SAFE_CHECK_PROJECT>();
+                List<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategoryAdd = new List<T_BS_SAFE_CHECK_PROJECT_CATEGORY>();
+
                 foreach (var item in entity.Nav_ListCheckDetail)
                 {
                     NUM++;
@@ -8287,6 +8319,39 @@ namespace APT.BS.WebApi.Controllers.Api
                         listDetailFiles.AddRange(item.Nav_Files);
                         item.Nav_Files = null;
                     }
+
+
+                    //判断 完善 检查表 项目与项目分类信息
+                    var checkProj = listCheakProject.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID);
+                    if (checkProj == null)
+                    {
+                        listCheakProjectAdd.Add(new T_BS_SAFE_CHECK_PROJECT()
+                        {
+
+                            ID = Guid.NewGuid(),
+                            ORG_ID = entity.ORG_ID,
+                            CREATER_ID = loginId,
+                            CREATE_TIME = dtNow,
+
+                            SAFE_CHECK_ID = entity.SAFE_CHECK_ID,
+                            CHECK_PROJECT_ID = item.CHECK_PROJECT_ID.Value
+                        });
+                    }
+                    var checkCategory = listCheakCategory.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
+                    if (checkCategory == null)
+                    {
+                        listCheakCategoryAdd.Add(new T_BS_SAFE_CHECK_PROJECT_CATEGORY()
+                        {
+
+                            ID = Guid.NewGuid(),
+                            ORG_ID = entity.ORG_ID,
+                            CREATER_ID = loginId,
+                            CREATE_TIME = dtNow,
+
+                            SAFE_CHECK_ID = entity.SAFE_CHECK_ID,
+                            CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID.Value
+                        });
+                    }
                 }
 
                 foreach (var item in listMain)
@@ -8303,6 +8368,22 @@ namespace APT.BS.WebApi.Controllers.Api
                     });
                 }
 
+                //检查区域 检查项目 检查项目分类 得完善到主表中
+                var areaCheck = listCheakArea.FirstOrDefault(e => e.RISK_AREA_ID == entity.RISK_AREA_ID);
+                if (areaCheck == null)
+                {
+                    cheakAreaAdd = new T_BS_SAFE_CHECK_RISK_AREA()
+                    {
+                        ID = Guid.NewGuid(),
+                        ORG_ID = entity.ORG_ID,
+                        CREATER_ID = loginId,
+                        CREATE_TIME = dtNow,
+
+                        SAFE_CHECK_ID = entity.SAFE_CHECK_ID,
+                        RISK_AREA_ID = entity.RISK_AREA_ID
+                    };
+                }
+
                 UnifiedCommit(() =>
                 {
                     if (listMain != null && listMain.Any())
@@ -8325,6 +8406,13 @@ namespace APT.BS.WebApi.Controllers.Api
                         BantchSaveEntityNoCommit(listDetailReason);//检查明细原因
                     if (listDetailFiles != null && listDetailFiles.Any())
                         BantchSaveEntityNoCommit(listDetailFiles);//检查明细附件
+
+                    if (cheakAreaAdd != null)
+                        UpdateEntity(cheakAreaAdd);//检查区域
+                    if (listCheakProjectAdd != null && listCheakProjectAdd.Any())
+                        BantchSaveEntityNoCommit(listCheakProjectAdd);//检查项目
+                    if (listCheakCategoryAdd != null && listCheakCategoryAdd.Any())
+                        BantchSaveEntityNoCommit(listCheakCategoryAdd);//检查项目分类
                 });
                 return true;
             });