安全检查同步 手动添加检查记录

检查日志完善
手动上报信息完善 优化

APT.BaseData.Services/Services/FM/FMFlowPermitService.cs

@@ -2096,12 +2096,16 @@ namespace APT.BaseData.Services.Services.FM
                     if (OPERATEPOINT == OPERATEPOINT_Enums.RiskInfoCompleteSD)
                     {
                         //手动隐患上报
-                        listOperateLog.Add(GetUpdateDeal(OPERATEPOINT, dataId.Value, LoginID, ListDATA_ID_SUB[0], taskEnd));
+                        var modelLog = GetUpdateDeal(OPERATEPOINT, dataId.Value, LoginID, ListDATA_ID_SUB[0], taskEnd);
+                        if (modelLog != null)
+                            listOperateLog.Add(modelLog);
                     }
                     else
                     {
                         //看看 是不是可以改到上面方法
-                        listOperateLog.Add(GetUpdateDeal(OPERATEPOINT, dataId.Value, LoginID, null, taskEnd));
+                        var modelLog = GetUpdateDeal(OPERATEPOINT, dataId.Value, LoginID, null, taskEnd);
+                        if (modelLog != null)
+                            listOperateLog.Add(modelLog);
                     }
                     foreach (var item in ListDATA_ID_SUB)
                     {

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

@@ -0,0 +1,74 @@
+using APT.BaseData.Domain.ApiModel.PF;
+using APT.BaseData.Domain.Entities;
+using APT.BaseData.Domain.Entities.FM;
+using APT.BaseData.Domain.Enums;
+using APT.BaseData.Domain.IServices;
+using APT.BaseData.Domain.IServices.FM;
+using APT.Infrastructure.Api;
+using APT.Infrastructure.Core;
+using APT.Migrations;
+using APT.MS.Domain.ApiModel.BS;
+using APT.MS.Domain.Entities.BS;
+using APT.MS.Domain.Entities.HM;
+using APT.MS.Domain.Entities.SC.SC;
+using APT.MS.Domain.Enums;
+using APT.Utility;
+using APT.WebApi.Models;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace APT.BS.WebApi.Controllers.Api
+{
+    [Route("api/BS/BSOperateLog")]
+    public partial class BSOperateLogController : AuthorizeApiController<T_BS_OPERATE_LOG>
+    {
+        /// <summary>
+        /// 排序查询所有数据
+        /// </summary>
+        /// <param name="filter">过滤实体</param>
+        /// <returns></returns>
+
+        [HttpPost, Route("OrderEntities")]
+        public JsonActionResult<IEnumerable<T_BS_OPERATE_LOG>> OrderEntities([FromBody] KeywordFilter filter)
+        {
+            return SafeExecute<IEnumerable<T_BS_OPERATE_LOG>>(() =>
+            {
+                if (string.IsNullOrEmpty(filter.Keyword))
+                {
+                    return new List<T_BS_OPERATE_LOG>();
+                }
+                else
+                {
+                    string Keyword = filter.Keyword;
+                    var ids = Keyword.Split("_");
+                    Guid? CheckID = null;
+                    Guid? SubmitID = null;
+                    for (int i = 0; i < ids.Length; i++)
+                    {
+                        if (!string.IsNullOrEmpty(ids[i]))
+                        {
+                            if (i == 0)
+                                CheckID = new Guid(ids[i]);
+                            else
+                                SubmitID = new Guid(ids[i]);
+                        }
+                    }
+                    List<T_BS_OPERATE_LOG> result = new List<T_BS_OPERATE_LOG>();
+                    if (CheckID != null)
+                    {
+                        result.AddRange(GetEntities<T_BS_OPERATE_LOG>(e => e.DATA_ID == CheckID.Value, null, null).OrderBy(e => e.OPERATEPOINT).ToList());
+                    }
+                    if (SubmitID != null)
+                    {
+                        result.AddRange(GetEntities<T_BS_OPERATE_LOG>(e => e.DATA_ID == SubmitID.Value, null, null).OrderBy(e => e.DATA_ID_SUB).ThenBy(e => e.OPERATEPOINT).ToList());
+                    }
+                    return result;
+                }
+            });
+        }
+    }
+}

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

@@ -6301,6 +6301,16 @@ namespace APT.BS.WebApi.Controllers.Api
                     if (entityContent.CHECKOBJECT.HasValue)
                         entity.CHECKOBJECT = entityContent.CHECKOBJECT;
                 }
+                else
+                {
+                    //获取页面传参
+                    entity.SUBMIT_STATUS = entityContent.SUBMIT_STATUS;
+                    if (entityContent.CHECK_TYPE_ID.HasValue)
+                        entity.CHECK_TYPE_ID = entityContent.CHECK_TYPE_ID;
+                    if (entityContent.CHECK_TYPE_LEVEL_ID.HasValue)
+                        entity.CHECK_TYPE_LEVEL_ID = entityContent.CHECK_TYPE_LEVEL_ID;
+                    entity.CHECKOBJECT = entityContent.CHECKOBJECT;
+                }
                 var files = entityContent.Nav_Files;
                 entityContent.Nav_Files = null;
                 var listRiskQuestionReason = entityContent.Nav_ListRiskQuestionReason;
@@ -6312,7 +6322,7 @@ namespace APT.BS.WebApi.Controllers.Api
                 {
                     //手动上报
                     if (!entity.CHECKOBJECT.HasValue)
-                        throw new Exception("请选择检查区域！");
+                        throw new Exception("请选择检查范围！");
                     if (!entity.CHECK_TYPE_ID.HasValue)
                         throw new Exception("请选择检查类型！");
                     if (!entity.CHECK_TYPE_LEVEL_ID.HasValue)

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

@@ -805,9 +805,9 @@ namespace APT.BS.WebApi.Controllers.Api
                 var checkDetailIds = result.Nav_ListSafeCheckDetail.Select(i => i.ID).Distinct();
 
                 var newFilter = new BaseFilter(result.ORG_ID);
-                newFilter.SelectField = new List<string> { "USER_ID", "SAFE_CHECK_DETAIL_ID", "SAFE_CHECK_ID" };
+                newFilter.SelectField = new List<string> { "USER_ID", "SAFE_CHECK_DETAIL_ID", "SAFE_CHECK_ID", "ISMAINCHECK" };
                 var cheDetailUsers = this.GetEntities<T_BS_SAFE_CHECK_DETAIL_USER>(i => result.ID == i.SAFE_CHECK_ID, newFilter);
-                var cheDetailUsersIds = cheDetailUsers.Select(i => i.USER_ID).ToList();
+                var cheDetailUsersIds = cheDetailUsers.Select(i => i.USER_ID).ToList().Distinct();
                 newFilter.SelectField = new List<string> { "Nav_UserSignFiles.Nav_ImgFile.Nav_File.FILE_PATH", "NAME" };
                 var cheUserList = this.GetEntities<T_FM_USER>(i => cheDetailUsersIds.Contains(i.ID), newFilter);
                 foreach (var c in cheDetailUsers)
@@ -3609,7 +3609,8 @@ namespace APT.BS.WebApi.Controllers.Api
                         }
                         if (item.CHECKRESULT.HasValue && item.CHECKRESULT > 0)
                         {
-                            item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription();
+                            item.CHECKRESULT_DESCRIPTION = "";
+                            //item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription();
                             item.QUESTION_LEVEL_DESCRIPTION = (item.QUESTION_LEVEL.HasValue && item.QUESTION_LEVEL != 0) ? ((BSQuestionLevelEnum)item.QUESTION_LEVEL).GetDescription() : "";
                         }
 
@@ -3636,7 +3637,7 @@ namespace APT.BS.WebApi.Controllers.Api
                                 //{
                                 if (listDetailQuestion[i].Nav_Question != null)
                                 {
-                                    item.CHECKRESULT_DESCRIPTION += ((1 > 0 ? "," : "") + listDetailQuestion[i].Nav_Question.DEMAND);
+                                    item.CHECKRESULT_DESCRIPTION += ((i > 0 ? "," : "") + listDetailQuestion[i].Nav_Question.DEMAND);
                                 }
                                 //}
                             }
@@ -3654,19 +3655,20 @@ namespace APT.BS.WebApi.Controllers.Api
 
                 if (result.Nav_ListSafeCheckDetail != null && result.Nav_ListSafeCheckDetail.Any())
                 {
-                    bool isAdd = true;
+                    //bool isAdd = true;
                     List<T_BS_SAFE_CHECK_DETAIL> listDetail = result.Nav_ListSafeCheckDetail.ToList();
                     //如果所有的检查明细都没有 检查问题描述
-                    foreach (var item in listDetail)
+                    //foreach (var item in listDetail)
-                    {
+                    //{
-                        if (isAdd && item.Nav_ListCheckDetailQuestion != null && item.Nav_ListCheckDetailQuestion.Count > 0)
+                    //    if (isAdd && item.Nav_ListCheckDetailQuestion != null && item.Nav_ListCheckDetailQuestion.Count > 0)
-                        {
+                    //    {
-                            isAdd = false;
+                    //        isAdd = false;
-                        }
+                    //        break;
-                    }
+                    //    }
+                    //}
 
-                    if (isAdd)
+                    //if (isAdd)
-                    {
+                    //{
                     T_BS_SAFE_CHECK_DETAIL_QUESTION QuestionWU = null;
                     Guid guidWu = new Guid("55555555-5555-5555-5555-555555555555");
                     var question = GetEntity<T_BS_CHECK_QUESTION>(e => e.ID == guidWu);
@@ -3748,13 +3750,19 @@ namespace APT.BS.WebApi.Controllers.Api
 
                     foreach (var item in listDetail)
                     {
+                        if (item.CHECKRESULT.HasValue && item.CHECKRESULT.Value != 10 && item.CHECKRESULT.Value != 0)
+                        {
+                            item.ISAUTOLOAD = false;
+                            continue;//有检查问题 直接返回
+                        }
+
+                        item.ISAUTOLOAD = true;
                         QuestionWU = new T_BS_SAFE_CHECK_DETAIL_QUESTION();
                         QuestionWU.ID = Guid.NewGuid();
                         QuestionWU.SAFE_CHECK_ID = item.SAFE_CHECK_ID;
                         QuestionWU.SAFE_CHECK_DETAIL_ID = item.ID;
                         QuestionWU.SAFE_CHECK_QUESTION_ID = guidWu;
                         QuestionWU.Nav_Question = question;
-                            QuestionWU.Nav_Question = question;
                         QuestionWU.IS_DELETED = false;
                         QuestionWU.ORG_ID = item.ORG_ID;
                         //QuestionWU.ENTITY_ORG_TPYE
@@ -3770,7 +3778,7 @@ namespace APT.BS.WebApi.Controllers.Api
                         //默认无 
                         item.Nav_ListCheckDetailQuestion.Add(QuestionWU);
                     }
-                    }
+                    //}
                 }
 
                 #endregion
@@ -8173,6 +8181,7 @@ namespace APT.BS.WebApi.Controllers.Api
             });
         }
 
+        /// <summary>
         /// 排序分页查询数据
         /// </summary>
         /// <param name="pageFilter">分页过滤实体</param>
@@ -8238,7 +8247,325 @@ namespace APT.BS.WebApi.Controllers.Api
                 result.TotalCount = orderPageEntities.TotalCount;
             });
         }
+
+        #region     检查登记自定义
+
+        /// <summary>
+        /// 手动新增检查记录
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        [HttpPost, Route("AddCheckRecord")]
+        public JsonActionResult<bool> AddCheckRecord([FromBody] ModelSafeCheckRecordAdd entity)
+        {
+            return SafeExecute(() =>
+            {
+                if (entity.SAFE_CHECK_ID == Guid.Empty)
+                {
+                    throw new Exception("获取信息失败，请让检查页面加载完成后再操作！");
                 }
+                if (entity.Nav_ListCheckDetail == null || !entity.Nav_ListCheckDetail.Any())
+                {
+                    throw new Exception("请添加检查记录后再提交！");
+                }
+                if (entity.Nav_ListUserCheck == null || !entity.Nav_ListUserCheck.Any())
+                {
+                    throw new Exception("获取检查人员信息失败！");
+                }
+                var loginId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
+                DateTime dtNow = DateTime.Now;
+                List<T_BS_CHECK_MAIN> listMain = new List<T_BS_CHECK_MAIN>();
+
+                List<T_BS_CHECK_CONTENT_MAIN_DEPARTMENT> listModelMainDep = new List<T_BS_CHECK_CONTENT_MAIN_DEPARTMENT>();
+
+                List<T_BS_SAFE_CHECK_DETAIL_USER> ListUserCheck = entity.Nav_ListUserCheck.ToList();
+                T_BS_CHECK_CONTENTS contents = new T_BS_CHECK_CONTENTS();//检查内容
+                contents.ID = Guid.NewGuid();
+                contents.CHECKCONTENT = entity.CHECKCONTENT;
+                contents.CHECKOBJECT = entity.CHECKOBJECT;
+                contents.ORG_ID = entity.ORG_ID;
+                contents.CREATER_ID = loginId;
+                contents.CREATE_TIME = dtNow;
+
+                List<T_BS_CHECK_QUESTION> listQuestion = new List<T_BS_CHECK_QUESTION>();//检查问题
+                List<T_BS_SAFE_CHECK_DETAIL> listDetail = new List<T_BS_SAFE_CHECK_DETAIL>();//检查明细
+                List<T_BS_SAFE_CHECK_DETAIL_USER> listDetailUser = new List<T_BS_SAFE_CHECK_DETAIL_USER>();//明细检查人员
+                List<T_BS_SAFE_CHECK_DETAIL_REASON> listDetailReason = new List<T_BS_SAFE_CHECK_DETAIL_REASON>();//明细隐患原因
+                List<T_BS_SAFE_CHECK_DETAIL_FILE> listDetailFiles = new List<T_BS_SAFE_CHECK_DETAIL_FILE>();//明细附件
+
+                List<T_BS_SAFE_CHECK_DETAIL_QUESTION> listDetailQuestion = new List<T_BS_SAFE_CHECK_DETAIL_QUESTION>();
+
+                T_BS_CHECK_MAIN modelMain = null;
+                int NUM = 0;
+                foreach (var item in entity.Nav_ListCheckDetail)
+                {
+                    NUM++;
+                    item.CHECK_CONTENTS_ID = contents.ID;
+                    item.ROW_NO = entity.ROW_NO + NUM;//如果第二次添加  ROW_NO 就可能不准确了，但是只影响到排序
+                    item.SAFE_CHECK_ID = entity.SAFE_CHECK_ID;
+                    item.CHECKCONTENT = entity.CHECKCONTENT;
+                    item.ISMAINCHANGE = false;
+                    item.CHECKTYPE = (int)CHECKTYPEEnum.PartCheck;
+                    item.CHECKRESULT = (int)CHECKRESULTEnum.Same;
+                    item.RISK_AREA_ID = entity.RISK_AREA_ID;
+                    item.CHECK_QUESTION_ID = Guid.NewGuid();//先生成检查问题ID
+                    item.SERIOUS_RISK = item.QUESTION_LEVEL.Value == 10 ? BSSeriousRiskEnum.是 : BSSeriousRiskEnum.否;
+                    item.IS_REJECTING = false;
+                    item.DEPARTMENT_ID = entity.DEPARTMENT_ID;
+                    modelMain = listMain.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID && e.QUESTION_LEVEL == item.QUESTION_LEVEL);
+                    if (modelMain == null)
+                    {
+                        modelMain = new T_BS_CHECK_MAIN();
+                        modelMain.ID = Guid.NewGuid();
+                        modelMain.ORG_ID = entity.ORG_ID;
+                        modelMain.CHECKOBJECT = (int)entity.CHECKOBJECT;
+                        modelMain.CHECK_PROJECT_ID = item.CHECK_PROJECT_ID;
+                        modelMain.CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID;
+                        modelMain.QUESTION_LEVEL = item.QUESTION_LEVEL.Value;
+                        modelMain.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID;
+                        modelMain.CHECKCONTENT = entity.CHECKCONTENT;
+                        modelMain.SERIOUS_RISK = (int)item.SERIOUS_RISK.Value;
+                        modelMain.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
+                        modelMain.CHECK_TYPE_LEVEL_ID = entity.CHECK_TYPE_LEVEL_ID;
+                        modelMain.RISK_AREA_ID = entity.RISK_AREA_ID;
+                        modelMain.ENABLE_STATUS = (int)FMEnableStatusEnum.禁用;//直接禁用 下次不出现
+                        modelMain.ISRISK = true;
+                        modelMain.CHECK_CONTENTS_ID = contents.ID;
+                        modelMain.CREATER_ID = loginId;
+                        modelMain.CREATE_TIME = dtNow;
+
+                        listMain.Add(modelMain);
+                    }
+
+                    item.CHECK_MAIN_ID = modelMain.ID;
+                    listDetail.Add(item);
+
+                    listQuestion.Add(new T_BS_CHECK_QUESTION()
+                    {
+                        ID = item.CHECK_QUESTION_ID.Value,
+                        CHECK_CONTENTS_ID = contents.ID,
+                        DESCREPTION = item.DESCREPTION,
+                        DEMAND = item.DEMAND,
+                        QUESTION_LEVEL = (BSQuestionLevelEnum)modelMain.QUESTION_LEVEL,
+                        NUM = NUM,
+                        SERIOUS_RISK = (int)item.SERIOUS_RISK,
+                        ORG_ID = entity.ORG_ID,
+                    });
+
+
+                    listDetailQuestion.Add(new T_BS_SAFE_CHECK_DETAIL_QUESTION()
+                    {
+                        ID = Guid.NewGuid(),
+                        ORG_ID = entity.ORG_ID,
+                        CREATER_ID = loginId,
+                        CREATE_TIME = dtNow,
+                        SAFE_CHECK_ID = entity.SAFE_CHECK_ID,
+                        SAFE_CHECK_DETAIL_ID = item.ID,
+                        SAFE_CHECK_QUESTION_ID = item.CHECK_QUESTION_ID
+                    });
+
+                    //检查人信息
+                    foreach (var itemChecker in ListUserCheck)
+                    {
+                        listDetailUser.Add(new T_BS_SAFE_CHECK_DETAIL_USER()
+                        {
+                            ID = Guid.NewGuid(),
+                            USER_ID = itemChecker.USER_ID,
+                            SAFE_CHECK_ID = itemChecker.SAFE_CHECK_ID,
+                            SAFE_CHECK_DETAIL_ID = item.ID,
+                            SAFECHECKSTATE = itemChecker.SAFECHECKSTATE,
+                            ISMAINCHECK = itemChecker.ISMAINCHECK,
+                            ISSAMEMAINCHECKOK = itemChecker.ISSAMEMAINCHECKOK,
+                            ISCHECK = itemChecker.ISCHECK,
+                            ORG_ID = entity.ORG_ID,
+                            CREATER_ID = loginId,
+                            CREATE_TIME = dtNow
+                        });
+                    }
+
+                    //隐患原因
+                    if (item.Nav_ListCheckDetailReason != null && item.Nav_ListCheckDetailReason.Any())
+                    {
+                        foreach (var itemReason in item.Nav_ListCheckDetailReason)
+                        {
+                            itemReason.CREATER_ID = loginId;
+                            itemReason.CREATE_TIME = dtNow;
+                        }
+                        listDetailReason.AddRange(item.Nav_ListCheckDetailReason);
+                        item.Nav_ListCheckDetailReason = null;
+                    }
+
+                    //附件
+                    if (item.Nav_Files != null && item.Nav_Files.Any())
+                    {
+                        foreach (var itemF in item.Nav_Files)
+                        {
+                            itemF.SAFE_CHECK_ID = entity.SAFE_CHECK_ID;
+                            itemF.CREATER_ID = loginId;
+                            itemF.CREATE_TIME = dtNow;
+                        }
+                        listDetailFiles.AddRange(item.Nav_Files);
+                        item.Nav_Files = null;
+                    }
+                }
+
+                foreach (var item in listMain)
+                {
+                    listModelMainDep.Add(new T_BS_CHECK_CONTENT_MAIN_DEPARTMENT()
+                    {
+                        ID = Guid.NewGuid(),
+                        MAIN_ID = item.ID,
+                        RESPONOBJECT = BSPLANCHECKOBJECTEnum.Hon,
+                        DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.DepartmentID,
+                        ORG_ID = entity.ORG_ID,
+                        CREATER_ID = loginId,
+                        CREATE_TIME = dtNow
+                    });
+                }
+
+                UnifiedCommit(() =>
+                {
+                    if (listMain != null && listMain.Any())
+                        BantchSaveEntityNoCommit(listMain);//检查库
+                    if (listModelMainDep != null && listModelMainDep.Any())
+                        BantchSaveEntityNoCommit(listModelMainDep);//检查库责任部门
+
+                    if (contents != null)
+                        UpdateEntityNoCommit(contents);//检查内容
+                    if (listQuestion != null && listQuestion.Any())
+                        BantchSaveEntityNoCommit(listQuestion);//检查问题
+
+                    if (listDetail != null && listDetail.Any())
+                        BantchSaveEntityNoCommit(listDetail);//检查明细
+                    if (listDetailQuestion != null && listDetailQuestion.Any())
+                        BantchSaveEntityNoCommit(listDetailQuestion);//检查明细检查问题
+                    if (listDetailUser != null && listDetailUser.Any())
+                        BantchSaveEntityNoCommit(listDetailUser);//检查明细人员
+                    if (listDetailReason != null && listDetailReason.Any())
+                        BantchSaveEntityNoCommit(listDetailReason);//检查明细原因
+                    if (listDetailFiles != null && listDetailFiles.Any())
+                        BantchSaveEntityNoCommit(listDetailFiles);//检查明细附件
+                });
+                return true;
+            });
+        }
+
+
+        /// <summary>
+        /// 排序分页查询数据
+        /// </summary>
+        /// <param name="pageFilter">分页过滤实体</param>
+        /// <returns></returns>
+        [HttpPost, Route("GetRecordArea")]
+        public PagedActionResult<T_HM_RISK_AREA> GetRecordArea([FromBody] KeywordFilter pageFilter)
+        {
+            return SafeGetPagedData<T_HM_RISK_AREA>((result) =>
+            {
+                Expression<Func<T_HM_RISK_AREA, bool>> expression = e => !e.IS_DELETED;
+
+                if (pageFilter.FilterGroup.Rules != null && pageFilter.FilterGroup.Rules.Any())
+                {
+                    foreach (var item in pageFilter.FilterGroup.Rules)
+                    {
+                        if (item.Field == "ID" && item.Value != null)
+                        {
+                            try
+                            {
+                                var ids = item.Value.ToString().Split(',', StringSplitOptions.RemoveEmptyEntries);
+                                List<Guid> listID = new List<Guid>();
+                                foreach (var itemID in ids)
+                                {
+                                    listID.Add(new Guid(itemID));
+                                }
+                                expression = expression.And(e => listID.Contains(e.ID));
+                                break;
+                            }
+                            catch { }
+                        }
+                    }
+                }
+                result.Data = GetEntities(expression, null, null);
+                result.TotalCount = result.Data.Count();
+            });
+        }
+
+        /// <summary>
+        /// 排序分页查询数据
+        /// </summary>
+        /// <param name="pageFilter">分页过滤实体</param>
+        /// <returns></returns>
+        [HttpPost, Route("GetRecordProject")]
+        public PagedActionResult<T_BS_CHECK_PROJECT> GetRecordProject([FromBody] KeywordPageFilter pageFilter)
+        {
+            return SafeGetPagedData<T_BS_CHECK_PROJECT>((result) =>
+            {
+                Expression<Func<T_BS_CHECK_PROJECT, bool>> expression = e => !e.IS_DELETED;
+                if (pageFilter.FilterGroup.Rules != null && pageFilter.FilterGroup.Rules.Any())
+                {
+                    foreach (var item in pageFilter.FilterGroup.Rules)
+                    {
+                        if (item.Field == "ID" && item.Value != null)
+                        {
+                            try
+                            {
+                                var ids = item.Value.ToString().Split(',', StringSplitOptions.RemoveEmptyEntries);
+                                List<Guid> listID = new List<Guid>();
+                                foreach (var itemID in ids)
+                                {
+                                    listID.Add(new Guid(itemID));
+                                }
+                                expression = expression.And(e => listID.Contains(e.ID));
+                                break;
+                            }
+                            catch { }
+                        }
+                    }
+                }
+                result.Data = GetEntities(expression, null, null);
+                result.TotalCount = result.Data.Count();
+            });
+        }
+
+        /// <summary>
+        /// 排序分页查询数据
+        /// </summary>
+        /// <param name="pageFilter">分页过滤实体</param>
+        /// <returns></returns>
+        [HttpPost, Route("GetRecordCategoty")]
+        public PagedActionResult<T_BS_CHECK_PROJECT_CATEGORY> GetRecordCategoty([FromBody] KeywordPageFilter pageFilter)
+        {
+            return SafeGetPagedData<T_BS_CHECK_PROJECT_CATEGORY>((result) =>
+            {
+                Expression<Func<T_BS_CHECK_PROJECT_CATEGORY, bool>> expression = e => !e.IS_DELETED;
+                if (pageFilter.FilterGroup.Rules != null && pageFilter.FilterGroup.Rules.Any())
+                {
+                    foreach (var item in pageFilter.FilterGroup.Rules)
+                    {
+                        if (item.Field == "ID" && item.Value != null)
+                        {
+                            try
+                            {
+                                var ids = item.Value.ToString().Split(',', StringSplitOptions.RemoveEmptyEntries);
+                                List<Guid> listID = new List<Guid>();
+                                foreach (var itemID in ids)
+                                {
+                                    listID.Add(new Guid(itemID));
+                                }
+                                expression = expression.And(e => listID.Contains(e.ID));
+                                break;
+                            }
+                            catch { }
+                        }
+                    }
+                }
+
+                result.Data = GetEntities(expression, null, null);
+                result.TotalCount = result.Data.Count();
+            });
+        }
+        #endregion
+    }
+
     /// <summary>
     /// 问题描述
     /// </summary>

APT.MicroApi/APT.BS.WebApi/Models/ModelSafeCheckRecordAdd.cs

@@ -0,0 +1,77 @@
+using APT.Infrastructure.Core;
+using APT.MS.Domain.Entities.BS;
+using APT.MS.Domain.Entities.HM;
+using APT.MS.Domain.Enums;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace APT.MS.Domain.Entities.BS
+{
+    /// <summary>
+    /// 检查登记 手动添加检查记录
+    /// </summary>
+    public class ModelSafeCheckRecordAdd : MesEntityBase
+    {
+        /// <summary>
+        /// 安全检查ID
+        /// </summary>
+        public Guid SAFE_CHECK_ID { get; set; }
+        /// <summary>
+        /// 部门ID
+        /// </summary>
+        public Guid DEPARTMENT_ID { get; set; }
+
+        /// <summary>
+        /// 检查对象
+        /// </summary>
+        [Description("检查对象")]
+        public BSMineTypeEnum CHECKOBJECT { get; set; }
+
+        /// <summary>
+        /// 检查区域
+        /// </summary>
+        [Description("检查区域")]
+        [DataFieldForeignKey("Nav_CheckArea")]
+        public Guid RISK_AREA_ID { get; set; }
+
+        /// <summary>
+        /// 检查类型
+        /// </summary>
+        [Description("检查类型")]
+        public Guid CHECK_TYPE_ID { get; set; }
+
+        /// <summary>
+        /// 检查层级
+        /// </summary>
+        [Description("检查层级")]
+        public Guid CHECK_TYPE_LEVEL_ID { get; set; }
+
+        /// <summary>
+        /// 检查区域
+        /// </summary>
+        [Description("导航：检查区域")]
+        public virtual T_HM_RISK_AREA Nav_CheckArea { get; set; }
+
+        /// <summary>
+        /// 原有表单明细数量
+        /// </summary>
+        public int ROW_NO { get; set; }
+
+        /// <summary>
+        /// 检查内容
+        /// </summary>
+        [Description("检查内容")]
+        [DataFieldLength(500)]
+        public string CHECKCONTENT { get; set; }
+
+        public virtual ICollection<T_BS_SAFE_CHECK_DETAIL_USER> Nav_ListUserCheck { get; set; }
+
+        /// <summary>
+        /// 检查记录
+        /// </summary>
+        [Description("检查记录")]
+        [FormFieldEdit]
+        public virtual ICollection<ModelSafeCheckRecordDetail> Nav_ListCheckDetail { get; set; }
+    }
+}

APT.MicroApi/APT.BS.WebApi/Models/ModelSafeCheckRecordDetail.cs

@@ -0,0 +1,29 @@
+using APT.Infrastructure.Core;
+using APT.MS.Domain.Entities.BS;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace APT.MS.Domain.Entities.BS
+{
+    /// <summary>
+    /// 检查登记 手动添加检查记录明细
+    /// </summary>
+    public class ModelSafeCheckRecordDetail : T_BS_SAFE_CHECK_DETAIL
+    {
+
+        /// <summary>
+        /// 问题描述
+        /// </summary>
+        [Description("检查问题描述")]
+        [DataFieldLength(500)]
+        public string DESCREPTION { get; set; }
+
+        /// <summary>
+        /// 整改要求及建议
+        /// </summary>
+        [Description("整改建议与措施")]
+        [DataFieldLength(500)]
+        public string DEMAND { get; set; }
+    }
+}