冲突

APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs

@@ -13052,7 +13052,9 @@ namespace APT.BaseData.Services.DomainServices
                 List<T_SK_RISK_EVALUATION_DETAIL> resultDetails = new List<T_SK_RISK_EVALUATION_DETAIL>();
                 List<T_SK_RISK_EVALUATION_DETAIL_MEASURE> detailMeasures = new List<T_SK_RISK_EVALUATION_DETAIL_MEASURE>();
                 List<T_SK_RISK_EVALUATION_DETAIL_DEPART> detailDeparts = new List<T_SK_RISK_EVALUATION_DETAIL_DEPART>();
-                List<T_SC_MT_MEETING_BEGIN> modelBegins = new List<T_SC_MT_MEETING_BEGIN>();
+                List<T_SK_RISK_EVALUATION_DETAIL_POST> detailPosts = new List<T_SK_RISK_EVALUATION_DETAIL_POST>();
+                List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> detailPostDetails = new List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>();
+                //List<T_SC_MT_MEETING_BEGIN> modelBegins = new List<T_SC_MT_MEETING_BEGIN>();
                 List<Guid> departIds = new List<Guid>();
                 var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
                 var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole", "Nav_Person");
@@ -13106,6 +13108,7 @@ namespace APT.BaseData.Services.DomainServices
                     var libraryIds = librarys.Select(t => t.ID).ToList();
                     var libraryDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID));
                     var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID));
+                    var libraryPosts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID), "Nav_PostDetails");
                     foreach (var bm in summarys)
                     {
                         var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID);
@@ -13178,8 +13181,8 @@ namespace APT.BaseData.Services.DomainServices
                                                 dep.ORG_ID = item.ORG_ID;
                                                 dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
                                                 detailDeparts.Add(dep);
-                                                var userFirst = users.FirstOrDefault(t => t.ID == item.USER_ID);
                                                 var departFirstTemp = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID);
+                                                var userFirst = users.FirstOrDefault(t => t.ID == departFirstTemp?.USER_ID);
                                                 var typeTemp = i + "、" + item.DEPARTMENT_TYPE.GetDescription() + "；";
                                                 detail.DEPARTMENT_TYPE = detail.DEPARTMENT_TYPE + typeTemp;
                                                 var departTempx = i + "、" + departFirstTemp?.NAME + "；"; ;
@@ -13189,6 +13192,29 @@ namespace APT.BaseData.Services.DomainServices
                                                 i++;
                                             }
                                         }
+                                        var libraryPostTemps = libraryPosts.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList();
+                                        if (libraryPostTemps.Any())
+                                        {
+                                            foreach (var item in libraryPostTemps)
+                                            {
+                                                T_SK_RISK_EVALUATION_DETAIL_POST dep = new T_SK_RISK_EVALUATION_DETAIL_POST();
+                                                dep.DEPARTMENT_ID = item.DEPARTMENT_ID;
+                                                dep.ORG_ID = item.ORG_ID;
+                                                dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
+                                                detailPosts.Add(dep);
+                                                if (item.Nav_PostDetails!=null && item.Nav_PostDetails.Any())
+                                                {
+                                                    foreach (var item2 in item.Nav_PostDetails)
+                                                    {
+                                                        T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL();
+                                                        depDetail.POST_ID = item2.POST_ID;
+                                                        depDetail.ORG_ID = item.ORG_ID;
+                                                        depDetail.RISK_EVALUATION_DETAIL_POST_ID = dep.ID;
+                                                        detailPostDetails.Add(depDetail);
+                                                    }
+                                                }
+                                            }
+                                        }
                                     }
                                     resultDetails.Add(detail);
                                 }
@@ -13234,8 +13260,12 @@ namespace APT.BaseData.Services.DomainServices
                         BantchSaveEntityNoCommit(detailDeparts);
                     if (detailMeasures != null && detailMeasures.Any())
                         BantchSaveEntityNoCommit(detailMeasures);
-                    if (modelBegins != null && modelBegins.Count > 0)
+                    if (detailPosts != null && detailPosts.Any())
-                        BantchSaveEntityNoCommit(modelBegins);
+                        BantchSaveEntityNoCommit(detailPosts);
+                    if (detailPostDetails != null && detailPostDetails.Any())
+                        BantchSaveEntityNoCommit(detailPostDetails);
+                    //if (modelBegins != null && modelBegins.Count > 0)
+                    //    BantchSaveEntityNoCommit(modelBegins);
                 });
             }
             return true;
@@ -13280,11 +13310,15 @@ namespace APT.BaseData.Services.DomainServices
                 List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL> resultDetails = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>();
                 List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE> detailMeasures = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>();
                 List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART> detailDeparts = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>();
+                List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST> detailPostSums = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>();
+                List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> detailPostDetailSums = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>();
                 //触发风险检查关联表
                 T_SK_DOUBLE_PREVENT_MECHANISM dou = null;
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> douDetails = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>();
+                List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART> detailDeps = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>();
+                List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
@@ -13293,6 +13327,7 @@ namespace APT.BaseData.Services.DomainServices
                 List<Guid> departIds = new List<Guid>();
                 var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
                 var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");
+                var userPosts = this.GetEntities<T_FM_USER_POST>(t => t.IS_DELETED == false, new BaseFilter(entity.ORG_ID));
                 var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == entity.APPLY_DEPARTMENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
                 if (user != null)
                 {
@@ -13426,7 +13461,7 @@ namespace APT.BaseData.Services.DomainServices
                     result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID;
                     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 details = GetEntities<T_SK_RISK_EVALUATION_DETAIL>(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts.Nav_PostDetails");
                     var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID }).Select(g => g.FirstOrDefault());
                     if (detailList.Any())
                     {
@@ -13496,6 +13531,38 @@ namespace APT.BaseData.Services.DomainServices
                                     i++;
                                 }
                             }
+                            if (de.Nav_DetailPosts != null && de.Nav_DetailPosts.Any())
+                            {
+                                var i = 1;
+                                foreach (var item in de.Nav_DetailPosts)
+                                {
+                                    T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST dep = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST();
+                                    dep.DEPARTMENT_ID = item.DEPARTMENT_ID;
+                                    dep.ORG_ID = item.ORG_ID;
+                                    dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID;
+                                    detailPostSums.Add(dep);
+                                    var departFirstTemp = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID);
+                                    var departTempx = i + "、" + departFirstTemp?.NAME + "；";
+                                    detail.EVALUATION_DEPARTMENT = detail.IDENTIFY_DEPARTMENT + departTempx;
+                                    if (item.Nav_PostDetails != null && item.Nav_PostDetails.Any())
+                                    {
+                                        var postIds = new List<Guid>();
+                                        foreach (var item2 in item.Nav_PostDetails)
+                                        {
+                                            T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL();
+                                            depDetail.POST_ID = item2.POST_ID;
+                                            depDetail.ORG_ID = item.ORG_ID;
+                                            depDetail.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = dep.ID;
+                                            detailPostDetailSums.Add(depDetail);
+                                            postIds.Add((Guid)item2.POST_ID);
+                                        }
+                                        var postFirstTemp = userPosts.Where(t => postIds.Contains(t.ID)).Select(m=>m.NAME).Distinct().ToList();
+                                        var postTempx = i + "、" + string.Join(",",postFirstTemp) + "；";
+                                        detail.EVALUATION_POST = detail.EVALUATION_POST + departTempx;
+                                    }
+                                    i++;
+                                }
+                            }
                         }
                     }
                     var param = "部门级";
@@ -13525,7 +13592,7 @@ namespace APT.BaseData.Services.DomainServices
                                 var productionId = resultDetails.FirstOrDefault(t=>t.PRODUCTION_UNIT_ID!=null).PRODUCTION_UNIT_ID;
                                 var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
                                 var libraryIds = librarys.Select(t => t.ID).ToList();
-                                var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
+                                //var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
                                 var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
                                 var detailIds = libraryDetails.Select(i => i.ID).ToList();
                                 var libraryContents = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(i => i.IS_DELETED == false && detailIds.Contains(i.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList();
@@ -13562,10 +13629,7 @@ namespace APT.BaseData.Services.DomainServices
                                     detail.EMERGENCY = item.EMERGENCY;
                                     detail.MARK = item.MARK;
                                     douDetails.Add(detail);
-                                    var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
+                                    var ldeparts = detailDeparts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
-                                    if (libraryFirst != null)
-                                    {
-                                        var ldeparts = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
                                     if (ldeparts.Any())
                                     {
                                         foreach (var item2 in ldeparts)
@@ -13579,6 +13643,47 @@ namespace APT.BaseData.Services.DomainServices
                                             detailPosts.Add(post);
                                         }
                                     }
+                                    var lposts = detailPostSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
+                                    if (lposts.Any())
+                                    {
+                                        foreach (var item2 in lposts)
+                                        {
+                                            T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART dep = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART();
+                                            dep.DEPARTMENT_ID = item2.DEPARTMENT_ID;
+                                            dep.ORG_ID = item.ORG_ID;
+                                            dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
+                                            detailDeps.Add(dep);
+                                            var lpostDetails = detailPostDetailSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).ToList();
+                                            if (lpostDetails != null && lpostDetails.Any())
+                                            {
+                                                foreach (var item3 in lpostDetails)
+                                                {
+                                                    T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL depDetail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL();
+                                                    depDetail.POST_ID = item3.POST_ID;
+                                                    depDetail.ORG_ID = item.ORG_ID;
+                                                    depDetail.MECHANISM_DETAIL_DEPART_ID = dep.ID;
+                                                    detailDepDets.Add(depDetail);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
+                                    if (libraryFirst != null)
+                                    {
+                                        //var ldeparts = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
+                                        //if (ldeparts.Any())
+                                        //{
+                                        //    foreach (var item2 in ldeparts)
+                                        //    {
+                                        //        T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST post = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST();
+                                        //        post.ORG_ID = item2.ORG_ID;
+                                        //        post.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
+                                        //        post.DEPARTMENT_TYPE = item2.DEPARTMENT_TYPE;
+                                        //        post.DEPARTMENT_ID = item2.DEPARTMENT_ID;
+                                        //        post.USER_ID = item2.USER_ID;
+                                        //        detailPosts.Add(post);
+                                        //    }
+                                        //}
                                         var measures = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
                                         if (measures.Any())
                                         {
@@ -13679,6 +13784,10 @@ namespace APT.BaseData.Services.DomainServices
                             BantchSaveEntityNoCommit(detailDeparts);
                         if (detailMeasures != null && detailMeasures.Any())
                             BantchSaveEntityNoCommit(detailMeasures);
+                        if (detailPostSums != null && detailPostSums.Any())
+                            BantchSaveEntityNoCommit(detailPostSums);
+                        if (detailPostDetailSums != null && detailPostDetailSums.Any())
+                            BantchSaveEntityNoCommit(detailPostDetailSums);
                         if (notice != null)
                             this.UpdateEntityNoCommit(notice);
                         if (dou != null)
@@ -13689,6 +13798,10 @@ namespace APT.BaseData.Services.DomainServices
                             BantchSaveEntityNoCommit(detailMes);
                         if (detailPosts != null && detailPosts.Count > 0)
                             BantchSaveEntityNoCommit(detailPosts);
+                        if (detailDeps != null && detailDeps.Count > 0)
+                            BantchSaveEntityNoCommit(detailDeps);
+                        if (detailDepDets != null && detailDepDets.Count > 0)
+                            BantchSaveEntityNoCommit(detailDepDets);
                         if (detailContents != null && detailContents.Count > 0)
                             BantchSaveEntityNoCommit(detailContents);
                         if (contentPosts != null && contentPosts.Count > 0)
@@ -13784,17 +13897,24 @@ namespace APT.BaseData.Services.DomainServices
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> details = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>();
+                List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART> detailDeps = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>();
+                List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
                 List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> contentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
                 if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any())
                 {
+                    var sumDetailIds = entity.Nav_Details.Select(t => t.ID).ToList();
+                    var sumDetailPosts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID));
+                    var sumPostIds = sumDetailPosts.Select(t => t.ID).ToList();
+                    var sumDetailPostDets = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(t => sumPostIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID));
+                    var sumDetailDeparts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID));
                     var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID);
                     var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID!=null)?.PRODUCTION_UNIT_ID;
                     var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
                     var libraryIds = librarys.Select(t => t.ID).ToList();
-                    var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
+                    //var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
                     var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
                     var detailIds = libraryDetails.Select(i => i.ID).ToList();
                     var libraryContents = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(i => i.IS_DELETED == false && detailIds.Contains(i.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList();
@@ -13831,13 +13951,10 @@ namespace APT.BaseData.Services.DomainServices
                         detail.EMERGENCY = item.EMERGENCY;
                         detail.MARK = item.MARK;
                         details.Add(detail);
-                        var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
+                        var ldeparts = sumDetailDeparts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
-                        if (libraryFirst != null)
+                        if (ldeparts.Any())
                         {
-                            var departs = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
+                            foreach (var item2 in ldeparts)
-                            if (departs.Any())
-                            {
-                                foreach (var item2 in departs)
                             {
                                 T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST post = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST();
                                 post.ORG_ID = item2.ORG_ID;
@@ -13848,6 +13965,47 @@ namespace APT.BaseData.Services.DomainServices
                                 detailPosts.Add(post);
                             }
                         }
+                        var lposts = sumDetailPosts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
+                        if (lposts.Any())
+                        {
+                            foreach (var item2 in lposts)
+                            {
+                                T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART dep = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART();
+                                dep.DEPARTMENT_ID = item2.DEPARTMENT_ID;
+                                dep.ORG_ID = item.ORG_ID;
+                                dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
+                                detailDeps.Add(dep);
+                                var lpostDetails = sumDetailPostDets.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).ToList();
+                                if (lpostDetails != null && lpostDetails.Any())
+                                {
+                                    foreach (var item3 in lpostDetails)
+                                    {
+                                        T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL depDetail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL();
+                                        depDetail.POST_ID = item3.POST_ID;
+                                        depDetail.ORG_ID = item.ORG_ID;
+                                        depDetail.MECHANISM_DETAIL_DEPART_ID = dep.ID;
+                                        detailDepDets.Add(depDetail);
+                                    }
+                                }
+                            }
+                        }
+                        var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
+                        if (libraryFirst != null)
+                        {
+                            //var departs = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
+                            //if (departs.Any())
+                            //{
+                            //    foreach (var item2 in departs)
+                            //    {
+                            //        T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST post = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST();
+                            //        post.ORG_ID = item2.ORG_ID;
+                            //        post.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
+                            //        post.DEPARTMENT_TYPE = item2.DEPARTMENT_TYPE;
+                            //        post.DEPARTMENT_ID = item2.DEPARTMENT_ID;
+                            //        post.USER_ID = item2.USER_ID;
+                            //        detailPosts.Add(post);
+                            //    }
+                            //}
                             var measures = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
                             if (measures.Any())
                             {
@@ -13949,6 +14107,10 @@ namespace APT.BaseData.Services.DomainServices
                         BantchSaveEntityNoCommit(detailMes);
                     if (detailPosts != null && detailPosts.Count > 0)
                         BantchSaveEntityNoCommit(detailPosts);
+                    if (detailDeps != null && detailDeps.Count > 0)
+                        BantchSaveEntityNoCommit(detailDeps);
+                    if (detailDepDets != null && detailDepDets.Count > 0)
+                        BantchSaveEntityNoCommit(detailDepDets);
                     if (detailContents != null && detailContents.Count > 0)
                         BantchSaveEntityNoCommit(detailContents);
                     if (contentPosts != null && contentPosts.Count > 0)

APT.Data.Migrations/Migrations/20251023024405_hmr2025102301.cs

@@ -0,0 +1,222 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2025102301 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_USER_POST_POST_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_USER_POST_POST_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
+
+            migrationBuilder.RenameColumn(
+                name: "POST_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
+                newName: "DEPARTMENT_ID");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_POST_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
+                newName: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DEPARTMENT_ID");
+
+            migrationBuilder.RenameColumn(
+                name: "POST_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST",
+                newName: "DEPARTMENT_ID");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_POST_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST",
+                newName: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DEPARTMENT_ID");
+
+            migrationBuilder.CreateTable(
+                name: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
+                columns: table => new
+                {
+                    ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    RISK_EVALUATION_DETAIL_POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
+                    ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
+                    FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_T_FM_ORGANIZATION_ORG_ID",
+                        column: x => x.ORG_ID,
+                        principalTable: "T_FM_ORGANIZATION",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_T_FM_USER_POST_POST_ID",
+                        column: x => x.POST_ID,
+                        principalTable: "T_FM_USER_POST",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_T_SK_RISK_EVALUATION_DETAIL_POST_RISK_EVALUATION_DETAIL_POST_ID",
+                        column: x => x.RISK_EVALUATION_DETAIL_POST_ID,
+                        principalTable: "T_SK_RISK_EVALUATION_DETAIL_POST",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
+                columns: table => new
+                {
+                    ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
+                    ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
+                    FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_FM_ORGANIZATION_ORG_ID",
+                        column: x => x.ORG_ID,
+                        principalTable: "T_FM_ORGANIZATION",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_FM_USER_POST_POST_ID",
+                        column: x => x.POST_ID,
+                        principalTable: "T_FM_USER_POST",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_RISK_EVALUATION_SUMMARY_DETAIL_POST~",
+                        column: x => x.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID,
+                        principalTable: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_ORG_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
+                column: "ORG_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_POST_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
+                column: "POST_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_RISK_EVALUATION_DETAIL_POST_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
+                column: "RISK_EVALUATION_DETAIL_POST_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_ORG_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
+                column: "ORG_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_POST_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
+                column: "POST_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_RISK_EVALUATION_SUMMARY_DETAIL_POST_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
+                column: "RISK_EVALUATION_SUMMARY_DETAIL_POST_ID");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST",
+                column: "DEPARTMENT_ID",
+                principalTable: "T_FM_DEPARTMENT",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
+                column: "DEPARTMENT_ID",
+                principalTable: "T_FM_DEPARTMENT",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
+
+            migrationBuilder.DropTable(
+                name: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL");
+
+            migrationBuilder.DropTable(
+                name: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL");
+
+            migrationBuilder.RenameColumn(
+                name: "DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
+                newName: "POST_ID");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
+                newName: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_POST_ID");
+
+            migrationBuilder.RenameColumn(
+                name: "DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST",
+                newName: "POST_ID");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DEPARTMENT_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST",
+                newName: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_POST_ID");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_USER_POST_POST_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL_POST",
+                column: "POST_ID",
+                principalTable: "T_FM_USER_POST",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_USER_POST_POST_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
+                column: "POST_ID",
+                principalTable: "T_FM_USER_POST",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}

APT.Data.Migrations/Migrations/20251023030919_hmr2025102302.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2025102302 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "EVALUATION_DEPARTMENT",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
+                type: "nvarchar(500)",
+                maxLength: 500,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "EVALUATION_POST",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
+                type: "nvarchar(500)",
+                maxLength: 500,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EVALUATION_DEPARTMENT",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "EVALUATION_POST",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -79290,6 +79290,63 @@ namespace APT.Data.Migrations.Migrations
                 });
 
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("CREATER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("CREATE_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("DEPARTMENT_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("ENTITY_ORG_TPYE")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FLOW_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("FLOW_SEND_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<int>("FLOW_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FORM_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("IS_DELETED")
+                        .HasColumnType("bit");
+
+                    b.Property<Guid?>("MODIFIER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("MODIFY_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("ORG_ID")
+                        .IsRequired()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RISK_EVALUATION_DETAIL_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DEPARTMENT_ID");
+
+                    b.HasIndex("ORG_ID");
+
+                    b.HasIndex("RISK_EVALUATION_DETAIL_ID");
+
+                    b.ToTable("T_SK_RISK_EVALUATION_DETAIL_POST");
+                });
+
+            modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL", b =>
                 {
                     b.Property<Guid>("ID")
                         .ValueGeneratedOnAdd()
@@ -79332,7 +79389,7 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<Guid?>("POST_ID")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("RISK_EVALUATION_DETAIL_ID")
+                    b.Property<Guid>("RISK_EVALUATION_DETAIL_POST_ID")
                         .HasColumnType("uniqueidentifier");
 
                     b.HasKey("ID");
@@ -79341,9 +79398,9 @@ namespace APT.Data.Migrations.Migrations
 
                     b.HasIndex("POST_ID");
 
-                    b.HasIndex("RISK_EVALUATION_DETAIL_ID");
+                    b.HasIndex("RISK_EVALUATION_DETAIL_POST_ID");
 
-                    b.ToTable("T_SK_RISK_EVALUATION_DETAIL_POST");
+                    b.ToTable("T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL");
                 });
 
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_FILE", b =>
@@ -79592,6 +79649,14 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<decimal>("EVALUATE_SCORE")
                         .HasColumnType("decimal(18,2)");
 
+                    b.Property<string>("EVALUATION_DEPARTMENT")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("EVALUATION_POST")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
                     b.Property<Guid?>("FLOW_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -79819,6 +79884,63 @@ namespace APT.Data.Migrations.Migrations
                 });
 
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("CREATER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("CREATE_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("DEPARTMENT_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("ENTITY_ORG_TPYE")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FLOW_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("FLOW_SEND_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<int>("FLOW_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FORM_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("IS_DELETED")
+                        .HasColumnType("bit");
+
+                    b.Property<Guid?>("MODIFIER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("MODIFY_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("ORG_ID")
+                        .IsRequired()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RISK_EVALUATION_SUMMARY_DETAIL_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DEPARTMENT_ID");
+
+                    b.HasIndex("ORG_ID");
+
+                    b.HasIndex("RISK_EVALUATION_SUMMARY_DETAIL_ID");
+
+                    b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
+                });
+
+            modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL", b =>
                 {
                     b.Property<Guid>("ID")
                         .ValueGeneratedOnAdd()
@@ -79861,7 +79983,7 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<Guid?>("POST_ID")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("RISK_EVALUATION_SUMMARY_DETAIL_ID")
+                    b.Property<Guid>("RISK_EVALUATION_SUMMARY_DETAIL_POST_ID")
                         .HasColumnType("uniqueidentifier");
 
                     b.HasKey("ID");
@@ -79870,9 +79992,9 @@ namespace APT.Data.Migrations.Migrations
 
                     b.HasIndex("POST_ID");
 
-                    b.HasIndex("RISK_EVALUATION_SUMMARY_DETAIL_ID");
+                    b.HasIndex("RISK_EVALUATION_SUMMARY_DETAIL_POST_ID");
 
-                    b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
+                    b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL");
                 });
 
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_FILE", b =>
@@ -121135,6 +121257,32 @@ namespace APT.Data.Migrations.Migrations
                 });
 
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b =>
+                {
+                    b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_Department")
+                        .WithMany()
+                        .HasForeignKey("DEPARTMENT_ID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
+                        .WithMany()
+                        .HasForeignKey("ORG_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL", "Nav_EvaluationDetail")
+                        .WithMany("Nav_DetailPosts")
+                        .HasForeignKey("RISK_EVALUATION_DETAIL_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Nav_Department");
+
+                    b.Navigation("Nav_EvaluationDetail");
+
+                    b.Navigation("Nav_Org");
+                });
+
+            modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL", b =>
                 {
                     b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
                         .WithMany()
@@ -121147,13 +121295,13 @@ namespace APT.Data.Migrations.Migrations
                         .HasForeignKey("POST_ID")
                         .OnDelete(DeleteBehavior.Restrict);
 
-                    b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL", "Nav_EvaluationDetail")
+                    b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", "Nav_DetailPost")
-                        .WithMany("Nav_DetailPosts")
+                        .WithMany("Nav_PostDetails")
-                        .HasForeignKey("RISK_EVALUATION_DETAIL_ID")
+                        .HasForeignKey("RISK_EVALUATION_DETAIL_POST_ID")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
-                    b.Navigation("Nav_EvaluationDetail");
+                    b.Navigation("Nav_DetailPost");
 
                     b.Navigation("Nav_Org");
 
@@ -121373,6 +121521,32 @@ namespace APT.Data.Migrations.Migrations
                 });
 
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b =>
+                {
+                    b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_Department")
+                        .WithMany()
+                        .HasForeignKey("DEPARTMENT_ID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
+                        .WithMany()
+                        .HasForeignKey("ORG_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL", "Nav_EvaluationDetail")
+                        .WithMany("Nav_DetailPosts")
+                        .HasForeignKey("RISK_EVALUATION_SUMMARY_DETAIL_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Nav_Department");
+
+                    b.Navigation("Nav_EvaluationDetail");
+
+                    b.Navigation("Nav_Org");
+                });
+
+            modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL", b =>
                 {
                     b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
                         .WithMany()
@@ -121385,13 +121559,13 @@ namespace APT.Data.Migrations.Migrations
                         .HasForeignKey("POST_ID")
                         .OnDelete(DeleteBehavior.Restrict);
 
-                    b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL", "Nav_EvaluationDetail")
+                    b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", "Nav_DetailPost")
-                        .WithMany("Nav_DetailPosts")
+                        .WithMany("Nav_PostDetails")
-                        .HasForeignKey("RISK_EVALUATION_SUMMARY_DETAIL_ID")
+                        .HasForeignKey("RISK_EVALUATION_SUMMARY_DETAIL_POST_ID")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
-                    b.Navigation("Nav_EvaluationDetail");
+                    b.Navigation("Nav_DetailPost");
 
                     b.Navigation("Nav_Org");
 
@@ -129202,6 +129376,11 @@ namespace APT.Data.Migrations.Migrations
                     b.Navigation("Nav_DetailPosts");
                 });
 
+            modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b =>
+                {
+                    b.Navigation("Nav_PostDetails");
+                });
+
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY", b =>
                 {
                     b.Navigation("Nav_Details");
@@ -129220,6 +129399,11 @@ namespace APT.Data.Migrations.Migrations
                     b.Navigation("Nav_DetailPosts");
                 });
 
+            modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b =>
+                {
+                    b.Navigation("Nav_PostDetails");
+                });
+
             modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY", b =>
                 {
                     b.Navigation("Nav_Details");

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

@@ -13635,6 +13635,17 @@ builder.Property(t => t.EMERGENCY).HasMaxLength(500);
 		{
 			base.Configure(builder);
 			builder.HasOne(t => t.Nav_EvaluationDetail).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.RISK_EVALUATION_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
+builder.HasOne(t => t.Nav_Department).WithMany().HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
+		} 
+     }
+	 #endregion
+					#region  RiskEvaluationDetailPostDetail
+     public partial class SKRiskEvaluationDetailPostDetailMap :APTEntityBaseMap<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>
+     {   
+        public override void Configure(EntityTypeBuilder<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> builder)
+		{
+			base.Configure(builder);
+			builder.HasOne(t => t.Nav_DetailPost).WithMany(t=>t.Nav_PostDetails).HasForeignKey(t => t.RISK_EVALUATION_DETAIL_POST_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict);
 		} 
      }
@@ -13700,6 +13711,8 @@ builder.HasOne(t => t.Nav_RiskName).WithMany().HasForeignKey(t => t.RISK_NAME_ID
 builder.HasOne(t => t.Nav_SCOREL).WithMany().HasForeignKey(t => t.SCOREL_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_SCOREE).WithMany().HasForeignKey(t => t.SCOREE_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_SCOREC).WithMany().HasForeignKey(t => t.SCOREC_ID).OnDelete(DeleteBehavior.Restrict);
+builder.Property(t => t.EVALUATION_DEPARTMENT).HasMaxLength(500);
+builder.Property(t => t.EVALUATION_POST).HasMaxLength(500);
 		} 
      }
 	 #endregion
@@ -13734,6 +13747,17 @@ builder.Property(t => t.EMERGENCY).HasMaxLength(500);
 		{
 			base.Configure(builder);
 			builder.HasOne(t => t.Nav_EvaluationDetail).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
+builder.HasOne(t => t.Nav_Department).WithMany().HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
+		} 
+     }
+	 #endregion
+					#region  RiskEvaluationSummaryDetailPostDetail
+     public partial class SKRiskEvaluationSummaryDetailPostDetailMap :APTEntityBaseMap<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>
+     {   
+        public override void Configure(EntityTypeBuilder<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> builder)
+		{
+			base.Configure(builder);
+			builder.HasOne(t => t.Nav_DetailPost).WithMany(t=>t.Nav_PostDetails).HasForeignKey(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict);
 		} 
      }

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

@@ -101,10 +101,10 @@ namespace APT.MS.Domain.Entities.SK
         [Description("管控措施")]
         [FormFieldEdit]
         public ICollection<T_SK_RISK_EVALUATION_DETAIL_MEASURE> Nav_DetailMeasures { get; set; }
-        [Description("辨识部门")]
+        [Description("管控部门层级")]
         [FormFieldEdit]
         public ICollection<T_SK_RISK_EVALUATION_DETAIL_DEPART> Nav_DetailDeparts { get; set; }
-        [Description("管控部门岗位")]
+        [Description("辨识岗位")]
         [FormFieldEdit]
         public ICollection<T_SK_RISK_EVALUATION_DETAIL_POST> Nav_DetailPosts { get; set; }
 

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

@@ -9,7 +9,7 @@ using System.Text;
 
 namespace APT.MS.Domain.Entities.SK
 {
-    [Description("辨识部门")]
+    [Description("管控部门层级")]
     public class T_SK_RISK_EVALUATION_DETAIL_DEPART : MesEntityBase
     {
         /// <summary>

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

@@ -7,7 +7,7 @@ using System.Text;
 
 namespace APT.MS.Domain.Entities.SK
 {
-    [Description("管控部门岗位")]
+    [Description("辨识部门")]
     public class T_SK_RISK_EVALUATION_DETAIL_POST : MesEntityBase
     {
         /// <summary>
@@ -23,11 +23,15 @@ namespace APT.MS.Domain.Entities.SK
         [Description("导航：安全风险评估表")]
         public virtual T_SK_RISK_EVALUATION_DETAIL Nav_EvaluationDetail { get; set; }
 
-        [Description("管控岗位")]
+        [Description("辨识部门")]
-        [DataFieldForeignKey("Nav_Post")]
+        [DataFieldForeignKey("Nav_Department")]
-        public Guid? POST_ID { get; set; }
+        public Guid? DEPARTMENT_ID { get; set; }
 
-        [Description("导航属性：管控岗位")]
+        [Description("导航属性：辨识部门")]
-        public T_FM_USER_POST Nav_Post { get; set; }
+        public T_FM_DEPARTMENT Nav_Department { get; set; }
+
+        [Description("辨识岗位表")]
+        [FormFieldEdit]
+        public ICollection<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> Nav_PostDetails { get; set; }
     }
 }

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

@@ -0,0 +1,33 @@
+using APT.BaseData.Domain.Entities.FM;
+using APT.Infrastructure.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace APT.MS.Domain.Entities.SK
+{
+    [Description("辨识岗位")]
+    public class T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL : MesEntityBase
+    {
+        /// <summary>
+        /// 安全风险评估辨识部门表
+        /// </summary>
+        [Description("安全风险评估辨识部门表")]
+        [DataFieldForeignKey("Nav_DetailPost", "Nav_PostDetails")]
+        public Guid RISK_EVALUATION_DETAIL_POST_ID { get; set; }
+
+        /// <summary>
+        /// 导航：安全风险评估辨识部门表
+        /// </summary>
+        [Description("导航：安全风险评估辨识部门表")]
+        public virtual T_SK_RISK_EVALUATION_DETAIL_POST Nav_DetailPost { get; set; }
+
+        [Description("辨识岗位")]
+        [DataFieldForeignKey("Nav_Post")]
+        public Guid? POST_ID { get; set; }
+
+        [Description("导航属性：辨识岗位")]
+        public T_FM_USER_POST Nav_Post { get; set; }
+    }
+}

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

@@ -157,5 +157,10 @@ namespace APT.MS.Domain.Entities.SK
         /// </summary>
         [Description("标识")]
         public SKMarkEnum MARK { get; set; }
+
+        [Description("辨识部门")]
+        public string EVALUATION_DEPARTMENT { get; set; }
+        [Description("辨识岗位")]
+        public string EVALUATION_POST { get; set; }
     }
 }

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

@@ -23,11 +23,15 @@ namespace APT.MS.Domain.Entities.SK
         [Description("导航：安全风险评估表")]
         public virtual T_SK_RISK_EVALUATION_SUMMARY_DETAIL Nav_EvaluationDetail { get; set; }
 
-        [Description("管控岗位")]
+        [Description("辨识部门")]
-        [DataFieldForeignKey("Nav_Post")]
+        [DataFieldForeignKey("Nav_Department")]
-        public Guid? POST_ID { get; set; }
+        public Guid? DEPARTMENT_ID { get; set; }
 
-        [Description("导航属性：管控岗位")]
+        [Description("导航属性：辨识部门")]
-        public T_FM_USER_POST Nav_Post { get; set; }
+        public T_FM_DEPARTMENT Nav_Department { get; set; }
+
+        [Description("辨识岗位表")]
+        [FormFieldEdit]
+        public ICollection<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> Nav_PostDetails { get; set; }
     }
 }

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

@@ -0,0 +1,33 @@
+using APT.BaseData.Domain.Entities.FM;
+using APT.Infrastructure.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace APT.MS.Domain.Entities.SK
+{
+    [Description("辨识部门")]
+    public class T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL : MesEntityBase
+    {
+        /// <summary>
+        /// 安全风险评估辨识部门表
+        /// </summary>
+        [Description("安全风险评估辨识部门表")]
+        [DataFieldForeignKey("Nav_DetailPost", "Nav_PostDetails")]
+        public Guid RISK_EVALUATION_SUMMARY_DETAIL_POST_ID { get; set; }
+
+        /// <summary>
+        /// 导航：安全风险评估辨识部门表
+        /// </summary>
+        [Description("导航：安全风险评估辨识部门表")]
+        public virtual T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST Nav_DetailPost { get; set; }
+
+        [Description("辨识岗位")]
+        [DataFieldForeignKey("Nav_Post")]
+        public Guid? POST_ID { get; set; }
+
+        [Description("导航属性：辨识岗位")]
+        public T_FM_USER_POST Nav_Post { get; set; }
+    }
+}

APT.MS.Domain/Enums/SK/SKEnums.cs

@@ -79,6 +79,11 @@ namespace APT.MS.Domain.Enums.SK
         /// </summary>
         [Description("修改")]
         Update = 20,
+        /// <summary>
+        /// 作废
+        /// </summary>
+        [Description("作废")]
+        Cancel = 25,
     }
     /// <summary>
     /// 是否入库

APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.BD.WebApi.Controllers.Api
 {
 	using APT.BaseData.Domain.Entities.BD;
+
 	#region  Hmi-HMI资源表维护
 	/// <summary>
     ///  HMI资源表维护
@@ -123,8 +130,10 @@ namespace APT.BD.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Picture-图片资源
 	/// <summary>
     ///  图片资源
@@ -232,8 +241,10 @@ namespace APT.BD.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PictureFile-资源图片文件
 	/// <summary>
     ///  资源图片文件
@@ -341,8 +352,10 @@ namespace APT.BD.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Place-区域表
 	/// <summary>
     ///  区域表
@@ -449,6 +462,7 @@ namespace APT.BD.WebApi.Controllers.Api
        {
            return WitEntity(null, filter);
        }
+       
               	/// <summary>
 	/// 获得树形实体数据
 	/// </summary>
@@ -460,8 +474,10 @@ namespace APT.BD.WebApi.Controllers.Api
 		return WitTreeOrderEntities(null, filter);
 	}
                
+
     }
 	#endregion
+
 	#region  ServerInfo-服务器信息表
 	/// <summary>
     ///  服务器信息表
@@ -569,8 +585,10 @@ namespace APT.BD.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SystemInfo-系统信息表
 	/// <summary>
     ///  系统信息表
@@ -678,8 +696,10 @@ namespace APT.BD.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  WordTemplate-WORD模板维护
 	/// <summary>
     ///  WORD模板维护
@@ -787,6 +807,8 @@ namespace APT.BD.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.BS.WebApi.Controllers.Api
 {
 	using APT.MS.Domain.Entities.BS;
+
 	#region  CheckContent-检查内容表
 	/// <summary>
     ///  检查内容表
@@ -123,8 +130,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckContents-检查内容
 	/// <summary>
     ///  检查内容
@@ -232,8 +241,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckContentCheckType-检查类型
 	/// <summary>
     ///  检查类型
@@ -341,8 +352,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
 	/// <summary>
     ///  检查内容检查类型子表(关联层级)
@@ -450,8 +463,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckContentHmRiskArea-检查区域
 	/// <summary>
     ///  检查区域
@@ -559,8 +574,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckMain-安全检查库
 	/// <summary>
     ///  安全检查库
@@ -668,8 +685,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckContentMainDepartment-安全检查库责任部门
 	/// <summary>
     ///  安全检查库责任部门
@@ -777,8 +796,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckContentQuestion-检查问题
 	/// <summary>
     ///  检查问题
@@ -886,8 +907,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckMainLaw-检查库法规
 	/// <summary>
     ///  检查库法规
@@ -995,8 +1018,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckProject-检查项目
 	/// <summary>
     ///  检查项目
@@ -1104,8 +1129,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckProjectCategory-检查项目分类表
 	/// <summary>
     ///  检查项目分类表
@@ -1213,8 +1240,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckProjectCategoryChecktype-检查项目分类_检查类型
 	/// <summary>
     ///  检查项目分类_检查类型
@@ -1322,8 +1351,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckProjectCategoryObject-检查项目分类_检查区域
 	/// <summary>
     ///  检查项目分类_检查区域
@@ -1431,8 +1462,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckProjectProjectCategory-检查项目分类
 	/// <summary>
     ///  检查项目分类
@@ -1540,8 +1573,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckQuestion-检查问题
 	/// <summary>
     ///  检查问题
@@ -1649,8 +1684,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckType-检查类型表
 	/// <summary>
     ///  检查类型表
@@ -1757,6 +1794,7 @@ namespace APT.BS.WebApi.Controllers.Api
        {
            return WitEntity(null, filter);
        }
+       
               	/// <summary>
 	/// 获得树形实体数据
 	/// </summary>
@@ -1768,8 +1806,10 @@ namespace APT.BS.WebApi.Controllers.Api
 		return WitTreeOrderEntities(null, filter);
 	}
                
+
     }
 	#endregion
+
 	#region  CheckTypeLevel-检查层级
 	/// <summary>
     ///  检查层级
@@ -1877,8 +1917,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CheckTypeMinetype-检查类型生产单元
 	/// <summary>
     ///  检查类型生产单元
@@ -1986,8 +2028,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentAreaobject-部门范围
 	/// <summary>
     ///  部门范围
@@ -2095,8 +2139,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  OperateLog-操作日志
 	/// <summary>
     ///  操作日志
@@ -2204,8 +2250,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PlanSet-制定任务
 	/// <summary>
     ///  制定任务
@@ -2313,8 +2361,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PlanSetArea-制定任务区域
 	/// <summary>
     ///  制定任务区域
@@ -2422,8 +2472,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PlanSetDepartmentOut-制定任务排除组织
 	/// <summary>
     ///  制定任务排除组织
@@ -2531,8 +2583,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PlanSetDepObject-制定任务部门触发范围
 	/// <summary>
     ///  制定任务部门触发范围
@@ -2640,8 +2694,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PlanSetObject-制定任务触发范围
 	/// <summary>
     ///  制定任务触发范围
@@ -2749,8 +2805,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskCategory-隐患类别
 	/// <summary>
     ///  隐患类别
@@ -2858,8 +2916,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskLevelDelayDays-隐患等级最长延期整改天数
 	/// <summary>
     ///  隐患等级最长延期整改天数
@@ -2967,8 +3027,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskReason-隐患原因表
 	/// <summary>
     ///  隐患原因表
@@ -3076,8 +3138,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmit-隐患上报表
 	/// <summary>
     ///  隐患上报表
@@ -3185,8 +3249,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContent-隐患上报明细
 	/// <summary>
     ///  隐患上报明细
@@ -3294,8 +3360,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentBack-隐患上报明细退回
 	/// <summary>
     ///  隐患上报明细退回
@@ -3403,8 +3471,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentDeal-隐患整改记录
 	/// <summary>
     ///  隐患整改记录
@@ -3512,8 +3582,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentDealAfterFile-检查任务附件表
 	/// <summary>
     ///  检查任务附件表
@@ -3621,8 +3693,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentDealFile-检查任务附件表
 	/// <summary>
     ///  检查任务附件表
@@ -3730,8 +3804,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentDealUserchecksign-隐患整改验收人签名
 	/// <summary>
     ///  隐患整改验收人签名
@@ -3839,8 +3915,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentDealUsersign-隐患整改责任人签名
 	/// <summary>
     ///  隐患整改责任人签名
@@ -3948,8 +4026,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentFile-检查任务明细附件表
 	/// <summary>
     ///  检查任务明细附件表
@@ -4057,8 +4137,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentReason-隐患上报明细原因
 	/// <summary>
     ///  隐患上报明细原因
@@ -4166,8 +4248,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitContentTemp-隐患上报详情待入库
 	/// <summary>
     ///  隐患上报详情待入库
@@ -4275,8 +4359,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitDelayApply-延期整改申请
 	/// <summary>
     ///  延期整改申请
@@ -4384,8 +4470,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitDelayApplyDetail-延期整改申请详情
 	/// <summary>
     ///  延期整改申请详情
@@ -4493,8 +4581,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitFile-检查任务附件表
 	/// <summary>
     ///  检查任务附件表
@@ -4602,8 +4692,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitNotice-隐患通知
 	/// <summary>
     ///  隐患通知
@@ -4711,8 +4803,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskSubmitNoticePerson-隐患通知
 	/// <summary>
     ///  隐患通知
@@ -4820,8 +4914,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskTpm-TPM对接数据
 	/// <summary>
     ///  TPM对接数据
@@ -4929,8 +5025,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheck-安全检查
 	/// <summary>
     ///  安全检查
@@ -5038,8 +5136,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetail-检查明细
 	/// <summary>
     ///  检查明细
@@ -5147,8 +5247,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetailFile-检查任务明细附件表
 	/// <summary>
     ///  检查任务明细附件表
@@ -5256,8 +5358,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetailLaw-检查依据
 	/// <summary>
     ///  检查依据
@@ -5365,8 +5469,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetailQuestion-检查明细问题
 	/// <summary>
     ///  检查明细问题
@@ -5474,8 +5580,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetailReason-检查明细隐患原因
 	/// <summary>
     ///  检查明细隐患原因
@@ -5583,8 +5691,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetailReject-检查明细退回
 	/// <summary>
     ///  检查明细退回
@@ -5692,8 +5802,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetailRejectFile-检查明细退回附件
 	/// <summary>
     ///  检查明细退回附件
@@ -5801,8 +5913,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckDetailUser-检查明细人员
 	/// <summary>
     ///  检查明细人员
@@ -5910,8 +6024,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckFile-安全检查文件
 	/// <summary>
     ///  安全检查文件
@@ -6019,8 +6135,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckProject-安全检查文件
 	/// <summary>
     ///  安全检查文件
@@ -6128,8 +6246,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckProjectCategory-安全检查文件
 	/// <summary>
     ///  安全检查文件
@@ -6237,8 +6357,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckRecord-检查记录确认
 	/// <summary>
     ///  检查记录确认
@@ -6346,8 +6468,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckRecordDetail-检查记录确认明细
 	/// <summary>
     ///  检查记录确认明细
@@ -6455,8 +6579,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckRiskArea-检查区域
 	/// <summary>
     ///  检查区域
@@ -6564,8 +6690,10 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SafeCheckUsersign-检查签名
 	/// <summary>
     ///  检查签名
@@ -6673,6 +6801,8 @@ namespace APT.BS.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -17,6 +23,7 @@ namespace APT.FM.WebApi.Controllers.Api
 {
 	using APT.BaseData.Domain.Entities.FM;
 using APT.BaseData.Domain.Entities;
+
 	#region  Api-API
 	/// <summary>
     ///  API
@@ -124,8 +131,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  BaseAdd-企业位置信息
 	/// <summary>
     ///  企业位置信息
@@ -233,8 +242,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  BaseEnergy-企业能耗配置信息
 	/// <summary>
     ///  企业能耗配置信息
@@ -342,8 +353,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  BaseInfo-企业基本信息
 	/// <summary>
     ///  企业基本信息
@@ -451,8 +464,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentCalendarConfig-部门日历配置表
 	/// <summary>
     ///  部门日历配置表
@@ -560,8 +575,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentCalendarConfigDetail-部门日历配置明细表
 	/// <summary>
     ///  部门日历配置明细表
@@ -669,8 +686,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentCalendarConfigTeam-部门日历配置班组表
 	/// <summary>
     ///  部门日历配置班组表
@@ -778,8 +797,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentCompletion-XX班完成情况统计
 	/// <summary>
     ///  XX班完成情况统计
@@ -887,8 +908,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentCompletionSort-班组完成情况前十
 	/// <summary>
     ///  班组完成情况前十
@@ -996,8 +1019,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentPost-部门岗位
 	/// <summary>
     ///  部门岗位
@@ -1105,8 +1130,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentPostUser-部门岗位人员
 	/// <summary>
     ///  部门岗位人员
@@ -1214,8 +1241,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentProductionUnit-生产单元
 	/// <summary>
     ///  生产单元
@@ -1323,8 +1352,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentSafeuser-安全员表
 	/// <summary>
     ///  安全员表
@@ -1432,8 +1463,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentScheduling-部门排班表
 	/// <summary>
     ///  部门排班表
@@ -1541,8 +1574,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentSchedulingDetail-排班信息人员明细表
 	/// <summary>
     ///  排班信息人员明细表
@@ -1650,8 +1685,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DepartmentUser-部门人员表
 	/// <summary>
     ///  部门人员表
@@ -1759,8 +1796,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Enum-枚举管理
 	/// <summary>
     ///  枚举管理
@@ -1868,8 +1907,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Enums-枚举表单
 	/// <summary>
     ///  枚举表单
@@ -1977,8 +2018,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  EnumItem-枚举项
 	/// <summary>
     ///  枚举项
@@ -2086,8 +2129,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  EnumType-枚举类别
 	/// <summary>
     ///  枚举类别
@@ -2195,8 +2240,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  HiddenDangerRectification-隐患整改完成情况统计
 	/// <summary>
     ///  隐患整改完成情况统计
@@ -2304,8 +2351,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityCompletion-班组作业完成率统计
 	/// <summary>
     ///  班组作业完成率统计
@@ -2413,8 +2462,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  MessageTemplate-短信模板表
 	/// <summary>
     ///  短信模板表
@@ -2522,8 +2573,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Monitoring-服务器监听表
 	/// <summary>
     ///  服务器监听表
@@ -2631,8 +2684,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Notice-信息通知表
 	/// <summary>
     ///  信息通知表
@@ -2740,8 +2795,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  NotificationTask-娑堟伅琛?
 	/// <summary>
     ///  娑堟伅琛?
@@ -2849,8 +2906,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
 	/// <summary>
     ///  寰呭姙琛ㄦ椂闂撮厤缃?
@@ -2958,8 +3017,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ParamSet-参数设置表
 	/// <summary>
     ///  参数设置表
@@ -3067,8 +3128,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ParamSetDepartment-组织关联信息
 	/// <summary>
     ///  组织关联信息
@@ -3176,8 +3239,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Person-人员信息
 	/// <summary>
     ///  人员信息
@@ -3285,8 +3350,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PersonCertificateFile-证书
 	/// <summary>
     ///  证书
@@ -3394,8 +3461,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PersonEducationFile-学历证
 	/// <summary>
     ///  学历证
@@ -3503,8 +3572,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PersonIdcardFile-身份证
 	/// <summary>
     ///  身份证
@@ -3612,8 +3683,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PersonSkills-技能
 	/// <summary>
     ///  技能
@@ -3721,8 +3794,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PersonWork-工作经历
 	/// <summary>
     ///  工作经历
@@ -3830,8 +3905,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskLevelProportion-风险等级占比
 	/// <summary>
     ///  风险等级占比
@@ -3939,8 +4016,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RiskTypeProportion-风险类别占比
 	/// <summary>
     ///  风险类别占比
@@ -4048,8 +4127,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RoleDepartment-部门权限
 	/// <summary>
     ///  部门权限
@@ -4157,8 +4238,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Snapshot-随手拍
 	/// <summary>
     ///  随手拍
@@ -4266,8 +4349,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SnapshotFile-随手拍图片
 	/// <summary>
     ///  随手拍图片
@@ -4375,8 +4460,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SyncLimit-数据同步次数限制
 	/// <summary>
     ///  数据同步次数限制
@@ -4484,8 +4571,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SyncLog-跑批日志表
 	/// <summary>
     ///  跑批日志表
@@ -4593,8 +4682,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SyncLogDetail-跑批日志明细表
 	/// <summary>
     ///  跑批日志明细表
@@ -4702,8 +4793,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SyncUserRule-用户数据同步例外配置
 	/// <summary>
     ///  用户数据同步例外配置
@@ -4811,8 +4904,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Team-班组表
 	/// <summary>
     ///  班组表
@@ -4920,8 +5015,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TeamPerson-班组人员关联信息
 	/// <summary>
     ///  班组人员关联信息
@@ -5029,8 +5126,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  UserDepartment-用户部门关联表
 	/// <summary>
     ///  用户部门关联表
@@ -5138,8 +5237,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  UserPost-宀椾綅鍒楄〃
 	/// <summary>
     ///  宀椾綅鍒楄〃
@@ -5247,8 +5348,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  UserProductionUnit-生产单元
 	/// <summary>
     ///  生产单元
@@ -5356,8 +5459,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  UserProductionUnitSet-生产单元
 	/// <summary>
     ///  生产单元
@@ -5465,8 +5570,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  UserSignFile-签名照片
 	/// <summary>
     ///  签名照片
@@ -5574,8 +5681,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  UserTest-测试多选
 	/// <summary>
     ///  测试多选
@@ -5683,8 +5792,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  UserVacationSet-人员休假设置
 	/// <summary>
     ///  人员休假设置
@@ -5792,8 +5903,10 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  WorkTicketCompletion-关键许可工作票完成情况统计
 	/// <summary>
     ///  关键许可工作票完成情况统计
@@ -5901,6 +6014,8 @@ using APT.BaseData.Domain.Entities;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.FO.WebApi.Controllers.Api
 {
 	using APT.MS.Domain.Entities.FO;
+
 	#region  ChangeShiftRecord-岗位交接班记录表
 	/// <summary>
     ///  岗位交接班记录表
@@ -123,8 +130,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ChangeShiftRecordAfterUser-接班人员表
 	/// <summary>
     ///  接班人员表
@@ -232,8 +241,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ChangeShiftRecordFile-附件表
 	/// <summary>
     ///  附件表
@@ -341,8 +352,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ChangeShiftRecordPreUser-交班人员表
 	/// <summary>
     ///  交班人员表
@@ -450,8 +463,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseDealMeasure-作业后处理措施
 	/// <summary>
     ///  作业后处理措施
@@ -559,8 +574,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseJob-关键许可工作表
 	/// <summary>
     ///  关键许可工作表
@@ -668,8 +685,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseJobFile-附件上传
 	/// <summary>
     ///  附件上传
@@ -777,8 +796,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseJobOutsource-关键许可工作表
 	/// <summary>
     ///  关键许可工作表
@@ -886,8 +907,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseOutsourceDealMeasure-作业后处理措施
 	/// <summary>
     ///  作业后处理措施
@@ -995,8 +1018,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseOutsourcePerson-关键许可人员表
 	/// <summary>
     ///  关键许可人员表
@@ -1104,8 +1129,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseOutsourceSafeConfirm-作业前安全确认
 	/// <summary>
     ///  作业前安全确认
@@ -1213,8 +1240,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseOutsourceSafeMeasure-作业流程及安全措施
 	/// <summary>
     ///  作业流程及安全措施
@@ -1322,8 +1351,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicensePerson-关键许可人员表
 	/// <summary>
     ///  关键许可人员表
@@ -1431,8 +1462,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseSafeConfirm-作业前安全确认
 	/// <summary>
     ///  作业前安全确认
@@ -1540,8 +1573,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CrucialLicenseSafeMeasure-作业流程及安全措施
 	/// <summary>
     ///  作业流程及安全措施
@@ -1649,8 +1684,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CurrentClassRecord-岗位当班工作记录表
 	/// <summary>
     ///  岗位当班工作记录表
@@ -1758,8 +1795,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CurrentClassRecordFile-附件表
 	/// <summary>
     ///  附件表
@@ -1867,8 +1906,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CurrentClassRecordLabourSupply-岗位当班劳保用品清单
 	/// <summary>
     ///  岗位当班劳保用品清单
@@ -1976,8 +2017,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CurrentClassRecordUser-岗位当班工作人员表
 	/// <summary>
     ///  岗位当班工作人员表
@@ -2085,8 +2128,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Holidays-国家法定假期维护
 	/// <summary>
     ///  国家法定假期维护
@@ -2194,8 +2239,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  HolidaysDetail-
 	/// <summary>
     ///  
@@ -2303,8 +2350,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityDetail-作业活动记录(关键/许可)明细表
 	/// <summary>
     ///  作业活动记录(关键/许可)明细表
@@ -2412,8 +2461,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityFile-作业活动记录附件表
 	/// <summary>
     ///  作业活动记录附件表
@@ -2521,8 +2572,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityFlow-作业流程及安全措施确认
 	/// <summary>
     ///  作业流程及安全措施确认
@@ -2630,8 +2683,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityFlowFile-作业流程及安全措施附件表
 	/// <summary>
     ///  作业流程及安全措施附件表
@@ -2739,8 +2794,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityMeasure-作业后处理措施确认
 	/// <summary>
     ///  作业后处理措施确认
@@ -2848,8 +2905,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityMeasureFile-作业活动记录附件表
 	/// <summary>
     ///  作业活动记录附件表
@@ -2957,8 +3016,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityPerson-作业活动记录(关键/许可)人员表
 	/// <summary>
     ///  作业活动记录(关键/许可)人员表
@@ -3066,8 +3127,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobActivityRecord-作业活动记录表(关键/许可)
 	/// <summary>
     ///  作业活动记录表(关键/许可)
@@ -3175,8 +3238,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventDetail-作业活动记录明细表
 	/// <summary>
     ///  作业活动记录明细表
@@ -3284,8 +3349,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventFile-作业活动记录附件表
 	/// <summary>
     ///  作业活动记录附件表
@@ -3393,8 +3460,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventFlow-作业流程及安全措施确认
 	/// <summary>
     ///  作业流程及安全措施确认
@@ -3502,8 +3571,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventFlowFile-作业流程及安全措施附件表
 	/// <summary>
     ///  作业流程及安全措施附件表
@@ -3611,8 +3682,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventMeasure-作业后处理措施确认
 	/// <summary>
     ///  作业后处理措施确认
@@ -3720,8 +3793,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventMeasureFile-作业活动记录附件表
 	/// <summary>
     ///  作业活动记录附件表
@@ -3829,8 +3904,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventPerson-作业活动记录人员表
 	/// <summary>
     ///  作业活动记录人员表
@@ -3938,8 +4015,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  JobEventRecord-作业活动记录表
 	/// <summary>
     ///  作业活动记录表
@@ -4047,8 +4126,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  LabourSupply-劳保用品
 	/// <summary>
     ///  劳保用品
@@ -4156,8 +4237,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreOperSch-作业方案讨论记录
 	/// <summary>
     ///  作业方案讨论记录
@@ -4265,8 +4348,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreOperSchFile-作业方案讨论记录附件
 	/// <summary>
     ///  作业方案讨论记录附件
@@ -4374,8 +4459,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreOperSchUser-作业方案讨论记录参会人员表
 	/// <summary>
     ///  作业方案讨论记录参会人员表
@@ -4483,8 +4570,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreShiftMeetingRecord-班前会议记录表
 	/// <summary>
     ///  班前会议记录表
@@ -4592,8 +4681,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreShiftMeetingRecordDetail-导航：上班生产情况
 	/// <summary>
     ///  导航：上班生产情况
@@ -4701,8 +4792,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreShiftMeetingRecordDetailPost-涉及岗位
 	/// <summary>
     ///  涉及岗位
@@ -4810,8 +4903,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreShiftMeetingRecordFile-班前会议附件
 	/// <summary>
     ///  班前会议附件
@@ -4919,8 +5014,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PreShiftMeetingRecordUser-班前会议记录与会人员表
 	/// <summary>
     ///  班前会议记录与会人员表
@@ -5028,8 +5125,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Scheduling-工作票排班明细
 	/// <summary>
     ///  工作票排班明细
@@ -5137,8 +5236,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SchedulingTemplate-工作票排班模板
 	/// <summary>
     ///  工作票排班模板
@@ -5246,8 +5347,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  SchedulingTemplateDetail-明细表
 	/// <summary>
     ///  明细表
@@ -5355,8 +5458,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TeamActivity-班组安全活动记录表
 	/// <summary>
     ///  班组安全活动记录表
@@ -5464,8 +5569,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TeamActivityFile-班组安全活动附件
 	/// <summary>
     ///  班组安全活动附件
@@ -5573,8 +5680,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TeamActivityUser-班组安全活动人员表
 	/// <summary>
     ///  班组安全活动人员表
@@ -5682,8 +5791,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TeamSlogan-班组口号配置
 	/// <summary>
     ///  班组口号配置
@@ -5791,8 +5902,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TechDisclosureFrom-技术交底表
 	/// <summary>
     ///  技术交底表
@@ -5900,8 +6013,10 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TechDisclosurePerson-被交底人员表
 	/// <summary>
     ///  被交底人员表
@@ -6009,6 +6124,8 @@ namespace APT.FO.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.LG.WebApi.Controllers.Api
 {
 	using APT.BaseData.Domain.Entities.LG;
+
 	#region  Oprate-表单操作日志表
 	/// <summary>
     ///  表单操作日志表
@@ -123,6 +130,8 @@ namespace APT.LG.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.NW.WebApi.Controllers.Api
 {
 	using APT.BaseData.Domain.Entities.NW;
+
 	#region  Enterprise-子企业表
 	/// <summary>
     ///  子企业表
@@ -122,6 +129,7 @@ namespace APT.NW.WebApi.Controllers.Api
        {
            return WitEntity(null, filter);
        }
+       
               	/// <summary>
 	/// 获得树形实体数据
 	/// </summary>
@@ -133,8 +141,10 @@ namespace APT.NW.WebApi.Controllers.Api
 		return WitTreeOrderEntities(null, filter);
 	}
                
+
     }
 	#endregion
+
 	#region  RoleDataPerm-子企业数据权限表
 	/// <summary>
     ///  子企业数据权限表
@@ -242,8 +252,10 @@ namespace APT.NW.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RoleMenu-子企业权限表
 	/// <summary>
     ///  子企业权限表
@@ -351,6 +363,8 @@ namespace APT.NW.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.OP.WebApi.Controllers.Api
 {
 	using APT.BaseData.Domain.Entities.OP;
+
 	#region  Alluser-用户表(租户平台)
 	/// <summary>
     ///  用户表(租户平台)
@@ -123,8 +130,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  BillingRule-计费规则表
 	/// <summary>
     ///  计费规则表
@@ -232,8 +241,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  BillingRuleVersion-计费规则子表
 	/// <summary>
     ///  计费规则子表
@@ -341,8 +352,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ChargeTimeSet-充电时长配置
 	/// <summary>
     ///  充电时长配置
@@ -450,8 +463,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Client-客户表
 	/// <summary>
     ///  客户表
@@ -559,8 +574,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ClinetOpenid-客户表OpenId
 	/// <summary>
     ///  客户表OpenId
@@ -668,8 +685,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CommonQuestion-常见问题
 	/// <summary>
     ///  常见问题
@@ -777,8 +796,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FileFirmware-充电桩固件表
 	/// <summary>
     ///  充电桩固件表
@@ -886,8 +907,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Member-会员表
 	/// <summary>
     ///  会员表
@@ -995,8 +1018,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Menu-菜单表(租户平台)
 	/// <summary>
     ///  菜单表(租户平台)
@@ -1103,6 +1128,7 @@ namespace APT.OP.WebApi.Controllers.Api
        {
            return WitEntity(null, filter);
        }
+       
               	/// <summary>
 	/// 获得树形实体数据
 	/// </summary>
@@ -1114,8 +1140,10 @@ namespace APT.OP.WebApi.Controllers.Api
 		return WitTreeOrderEntities(null, filter);
 	}
                
+
     }
 	#endregion
+
 	#region  Notice-公告表
 	/// <summary>
     ///  公告表
@@ -1223,8 +1251,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  NoticeDetail-公告内容
 	/// <summary>
     ///  公告内容
@@ -1332,8 +1362,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PeakValleyConfig-峰谷配置表
 	/// <summary>
     ///  峰谷配置表
@@ -1441,8 +1473,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RechargeCard-充值卡
 	/// <summary>
     ///  充值卡
@@ -1550,8 +1584,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RechargeOrder-充值订单
 	/// <summary>
     ///  充值订单
@@ -1659,8 +1695,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RechargeSetting-充值金额配置
 	/// <summary>
     ///  充值金额配置
@@ -1768,8 +1806,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RfidCard-RFID卡
 	/// <summary>
     ///  RFID卡
@@ -1877,8 +1917,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  RoleMenu-租户权限表
 	/// <summary>
     ///  租户权限表
@@ -1986,8 +2028,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Tenant-租户表
 	/// <summary>
     ///  租户表
@@ -2095,8 +2139,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TenantDbConn-租户数据库表
 	/// <summary>
     ///  租户数据库表
@@ -2204,8 +2250,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TenantDomain-租户域名表
 	/// <summary>
     ///  租户域名表
@@ -2313,8 +2361,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  TenantExpiration-租户租期表
 	/// <summary>
     ///  租户租期表
@@ -2422,8 +2472,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  User-用户表(租户平台)
 	/// <summary>
     ///  用户表(租户平台)
@@ -2531,8 +2583,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Version-版本升级表
 	/// <summary>
     ///  版本升级表
@@ -2640,8 +2694,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  VersionMenu-菜单版本升级表
 	/// <summary>
     ///  菜单版本升级表
@@ -2749,8 +2805,10 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  VersionTenant-租户版本升级表
 	/// <summary>
     ///  租户版本升级表
@@ -2858,6 +2916,8 @@ namespace APT.OP.WebApi.Controllers.Api
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -19,6 +25,7 @@ namespace APT.PF.WebApi.Controllers.Api
 using APT.BaseData.Domain.Entities;
 using APT.BaseData.Domain.Entities.PF;
 using APT.BaseData.Domain.Entities.T4;
+
 	#region  ApprovalRole-审批角色
 	/// <summary>
     ///  审批角色
@@ -126,8 +133,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Approve-审批流主表
 	/// <summary>
     ///  审批流主表
@@ -235,8 +244,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ApproveDetail-审批流子表
 	/// <summary>
     ///  审批流子表
@@ -344,8 +355,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ApproveOperationRole-操作角色
 	/// <summary>
     ///  操作角色
@@ -453,8 +466,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ApproveRejectConfig-审批驳回配置表
 	/// <summary>
     ///  审批驳回配置表
@@ -562,8 +577,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ApproveRoleDepartment-分管部门
 	/// <summary>
     ///  分管部门
@@ -671,8 +688,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ApproveTemp-审批流模板主表
 	/// <summary>
     ///  审批流模板主表
@@ -780,8 +799,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ApproveTempDetail-审批流模板子表
 	/// <summary>
     ///  审批流模板子表
@@ -889,8 +910,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  AppVersion-App版本发布
 	/// <summary>
     ///  App版本发布
@@ -998,8 +1021,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  AppVersionFile-App包文件
 	/// <summary>
     ///  App包文件
@@ -1107,8 +1132,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ClientScopes-资源表
 	/// <summary>
     ///  资源表
@@ -1216,8 +1243,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  CodeRuleRunLog-编码规则跑批表
 	/// <summary>
     ///  编码规则跑批表
@@ -1325,8 +1354,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  ComplaintLog-转办记录表
 	/// <summary>
     ///  转办记录表
@@ -1434,8 +1465,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DataChannel-数据通道
 	/// <summary>
     ///  数据通道
@@ -1543,8 +1576,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  DataFrequency-采集频率
 	/// <summary>
     ///  采集频率
@@ -1652,8 +1687,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Fddeback-意见反馈
 	/// <summary>
     ///  意见反馈
@@ -1761,8 +1798,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FddebackFile-意见反馈附件
 	/// <summary>
     ///  意见反馈附件
@@ -1870,8 +1909,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FileDb-
 	/// <summary>
     ///  
@@ -1979,8 +2020,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FileDbFile-
 	/// <summary>
     ///  
@@ -2088,8 +2131,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FileType-
 	/// <summary>
     ///  
@@ -2197,8 +2242,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FormHomeChart-首页：图标区域
 	/// <summary>
     ///  首页：图标区域
@@ -2306,8 +2353,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FormHomeHmi-首页：HMI区域
 	/// <summary>
     ///  首页：HMI区域
@@ -2415,8 +2464,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FormHomeRanking-首页：排名区域
 	/// <summary>
     ///  首页：排名区域
@@ -2524,8 +2575,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FormHomeStatistic-首页：统计区域
 	/// <summary>
     ///  首页：统计区域
@@ -2633,8 +2686,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  FormRelation-关联表单配置
 	/// <summary>
     ///  关联表单配置
@@ -2742,8 +2797,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  HomeTitle-首页方针
 	/// <summary>
     ///  首页方针
@@ -2851,8 +2908,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  MqttConfig-MQTT配置表
 	/// <summary>
     ///  MQTT配置表
@@ -2960,8 +3019,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  MqttConfigTheme-
 	/// <summary>
     ///  
@@ -3069,8 +3130,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Notice-通知
 	/// <summary>
     ///  通知
@@ -3178,8 +3241,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  NoticeFile-
 	/// <summary>
     ///  
@@ -3287,8 +3352,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PicFilter-图片条件主表
 	/// <summary>
     ///  图片条件主表
@@ -3396,8 +3463,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  PicFilterDetail-图片条件子表
 	/// <summary>
     ///  图片条件子表
@@ -3505,8 +3574,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  QuestionFeedback-问题反馈表
 	/// <summary>
     ///  问题反馈表
@@ -3614,8 +3685,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  QuestionFeedbackFile-问题反馈附件表
 	/// <summary>
     ///  问题反馈附件表
@@ -3723,8 +3796,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  Scopes-资源表
 	/// <summary>
     ///  资源表
@@ -3832,8 +3907,10 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
 	#region  VersionManage-版本管理表
 	/// <summary>
     ///  版本管理表
@@ -3941,6 +4018,8 @@ using APT.BaseData.Domain.Entities.T4;
            return WitEntity(null, filter);
        }
        
+
     }
 	#endregion
+
  }

APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.cs

@@ -2,6 +2,12 @@
 
  
 
+
+
+ 
+ 
+  
+
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
 //     此代码由T4模板自动生成
@@ -15,4 +21,5 @@ using APT.Infrastructure.Api;
 using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.PP.WebApi.Controllers.Api
 {
+	
  }

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

@@ -60,10 +60,12 @@ namespace APT.SK.WebApi.Controllers.Api
                 List<Guid> deleteMeasureIds = new List<Guid>();
                 List<Guid> deleteDepartIds = new List<Guid>();
                 List<Guid> deletePostIds = new List<Guid>();
+                List<Guid> deletePostDetIds = new List<Guid>();
                 List<Guid> deleteDetailIds = new List<Guid>();
                 List<T_SK_RISK_EVALUATION_DETAIL_MEASURE> measureList = new List<T_SK_RISK_EVALUATION_DETAIL_MEASURE>();
                 List<T_SK_RISK_EVALUATION_DETAIL_DEPART> departList = new List<T_SK_RISK_EVALUATION_DETAIL_DEPART>();
                 List<T_SK_RISK_EVALUATION_DETAIL_POST> postList = new List<T_SK_RISK_EVALUATION_DETAIL_POST>();
+                List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> postDetList = new List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>();
                 //更新标识字段
                 var record = this.GetEntity<T_SK_RISK_EVALUATION>(t => t.ID == entity.ID, "Nav_Details");
                 if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any())
@@ -72,6 +74,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
+                    deletePostDetIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>(t => deletePostIds.Contains(t.RISK_EVALUATION_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     foreach (var item in details)
                     {
                         var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
@@ -134,6 +137,15 @@ namespace APT.SK.WebApi.Controllers.Api
                                 item2.ORG_ID = entity.ORG_ID;
                                 item2.RISK_EVALUATION_DETAIL_ID = item.ID;
                                 postList.Add(item2);
+                                if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any())
+                                {
+                                    foreach (var item3 in item2.Nav_PostDetails)
+                                    {
+                                        item3.ORG_ID = entity.ORG_ID;
+                                        item3.RISK_EVALUATION_DETAIL_POST_ID = item2.ID;
+                                        postDetList.Add(item3);
+                                    }
+                                }
                             }
                         }
                         item.Nav_DetailPosts = null;
@@ -208,6 +220,8 @@ namespace APT.SK.WebApi.Controllers.Api
                             this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(deleteMeasureIds);
                         if (deleteDepartIds != null && deleteDepartIds.Any())
                             this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_DEPART>(deleteDepartIds);
+                        if (deletePostDetIds != null && deletePostDetIds.Any())
+                            this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>(deletePostDetIds);
                         if (deletePostIds != null && deletePostIds.Any())
                             this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST>(deletePostIds);
                         if (deleteDetailIds != null && deleteDetailIds.Any())
@@ -224,6 +238,10 @@ namespace APT.SK.WebApi.Controllers.Api
                             BantchSaveEntityNoCommit(measureList);
                         if (departList != null && departList.Any())
                             BantchSaveEntityNoCommit(departList);
+                        if (postList != null && postList.Any())
+                            BantchSaveEntityNoCommit(postList);
+                        if (postDetList != null && postDetList.Any())
+                            BantchSaveEntityNoCommit(postDetList);
                     }, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估表审批");
                     return true;
                 }
@@ -233,6 +251,8 @@ namespace APT.SK.WebApi.Controllers.Api
                         this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(deleteMeasureIds);
                     if (deleteDepartIds != null && deleteDepartIds.Any())
                         this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_DEPART>(deleteDepartIds);
+                    if (deletePostDetIds != null && deletePostDetIds.Any())
+                        this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>(deletePostDetIds);
                     if (deletePostIds != null && deletePostIds.Any())
                         this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST>(deletePostIds);
                     if (deleteDetailIds != null && deleteDetailIds.Any())
@@ -249,6 +269,10 @@ namespace APT.SK.WebApi.Controllers.Api
                         BantchSaveEntityNoCommit(measureList);
                     if (departList != null && departList.Any())
                         BantchSaveEntityNoCommit(departList);
+                    if (postList != null && postList.Any())
+                        BantchSaveEntityNoCommit(postList);
+                    if (postDetList != null && postDetList.Any())
+                        BantchSaveEntityNoCommit(postDetList);
                 });
                 return true;
             });
@@ -277,7 +301,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         var detailIds = details.Select(t => t.ID).ToList();
                         var measures = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId));
                         var departs = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User");
-                        var posts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Post");
+                        var posts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
                         foreach (var detail in details)
                         {
                             var measureTemps = measures.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList();
@@ -285,7 +309,7 @@ namespace APT.SK.WebApi.Controllers.Api
                             var departTemps = departs.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList();
                             detail.Nav_DetailDeparts = departTemps.OrderBy(t => t.DEPARTMENT_TYPE).ThenBy(m => m.Nav_Department.NUM).ToList();
                             var postTemps = posts.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList();
-                            detail.Nav_DetailPosts = postTemps.OrderBy(t => t.POST_ID).ToList();
+                            detail.Nav_DetailPosts = postTemps.OrderBy(t => t.DEPARTMENT_ID).ToList();
                         }
                     }
                     result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m => m.AREA_ID).ThenBy(n => n.TYPE_ID).ToList();

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

@@ -56,6 +56,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 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>();
+                List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> postDetList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>();
                 if (details != null && details.Any())
                 {
                     foreach (var item in details)
@@ -89,6 +90,15 @@ namespace APT.SK.WebApi.Controllers.Api
                                 item2.ORG_ID = entity.ORG_ID;
                                 item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID;
                                 postList.Add(item2);
+                                if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any())
+                                {
+                                    foreach (var item3 in item2.Nav_PostDetails)
+                                    {
+                                        item3.ORG_ID = entity.ORG_ID;
+                                        item3.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = item2.ID;
+                                        postDetList.Add(item3);
+                                    }
+                                }
                             }
                         }
                         item.Nav_DetailPosts = null;
@@ -137,6 +147,10 @@ namespace APT.SK.WebApi.Controllers.Api
                             BantchSaveEntityNoCommit(measureList);
                         if (departList != null && departList.Any())
                             BantchSaveEntityNoCommit(departList);
+                        if (postList != null && postList.Any())
+                            BantchSaveEntityNoCommit(postList);
+                        if (postDetList != null && postDetList.Any())
+                            BantchSaveEntityNoCommit(postDetList);
                     }, null, null, null, null, null, "SK041_SHOWPRINT", null, "安全风险评估汇总表审批");
                     return true;
                 }
@@ -154,6 +168,10 @@ namespace APT.SK.WebApi.Controllers.Api
                         BantchSaveEntityNoCommit(measureList);
                     if (departList != null && departList.Any())
                         BantchSaveEntityNoCommit(departList);
+                    if (postList != null && postList.Any())
+                        BantchSaveEntityNoCommit(postList);
+                    if (postDetList != null && postDetList.Any())
+                        BantchSaveEntityNoCommit(postDetList);
                 });
                 return true;
             });
@@ -184,7 +202,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         var detailIds = details.Select(t => t.ID).ToList();
                         var measures = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId));
                         var departs = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User");
-                        var posts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Post");
+                        var posts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
                         foreach (var detail in details)
                         {
                             var temps = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>();
@@ -197,7 +215,7 @@ namespace APT.SK.WebApi.Controllers.Api
                             temps.AddRange(tempy);
                             detail.Nav_DetailDeparts = temps.ToList();
                             var postTemps = posts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList();
-                            detail.Nav_DetailPosts = postTemps.OrderBy(t => t.POST_ID).ToList();
+                            detail.Nav_DetailPosts = postTemps.OrderBy(t => t.DEPARTMENT_ID).ToList();
                         }
                     }
                     result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m => m.AREA_ID).ThenBy(n => n.TYPE_ID).ToList();