wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

风险辨识计划取全公司

Browse Source
This commit is contained in:
何美荣 2026-06-03 10:48:16 +08:00
parent a938576f3f
commit 53889ba0f0
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -1084,23 +1084,28 @@ namespace APT.PP.WebApi.Controllers.Api
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, filter.OrgId.Value, DateTime.Now, null, null); DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, filter.OrgId.Value, DateTime.Now, null, null);
if (setList != null && setList.Any()) if (setList != null && setList.Any())
{ {
var departMentTemps = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)).ToList(); var departMentTemps = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(filter.OrgId)).ToList();
var topDepart = departMentTemps.FirstOrDefault(t => t.PARENT_ID == null); var topDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 5 && t.PARENT_ID == null).OrderBy(t => t.NUM).ToList();
//deppartList.Add(topDepart); deppartList.AddRange(topDeparts);
var departMents = GetSons(departMentTemps, topDepart.ID).OrderBy(t => t.PARENT_ID).ThenBy(t => t.NUM); //var departMents = GetSons(departMentTemps, topDepart.ID).OrderBy(t => t.PARENT_ID).ThenBy(t => t.NUM);
var comDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 5).ToList(); var comDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 5 && t.PARENT_ID != null).OrderBy(t => t.NUM).ToList();
deppartList.AddRange(comDeparts); //deppartList.AddRange(comDeparts);
var bmDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 10).ToList(); foreach (var cm in comDeparts)
foreach (var bm in bmDeparts) {
deppartList.Add(cm);
var bmDepart = departMentTemps.Where(t => t.PARENT_ID == cm.ID).OrderBy(t => t.NUM).ToList();
if (bmDepart.Any())
{
foreach (var bm in bmDepart)
{ {
deppartList.Add(bm); deppartList.Add(bm);
var cjDepart = departMents.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList(); var cjDepart = departMentTemps.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList();
if (cjDepart.Any()) if (cjDepart.Any())
{ {
foreach (var cj in cjDepart) foreach (var cj in cjDepart)
{ {
deppartList.Add(cj); deppartList.Add(cj);
var bzDepart = departMents.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList(); var bzDepart = departMentTemps.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList();
if (bzDepart.Any()) if (bzDepart.Any())
{ {
deppartList.AddRange(bzDepart); deppartList.AddRange(bzDepart);
@ -1108,6 +1113,26 @@ namespace APT.PP.WebApi.Controllers.Api
} }
} }
} }
}
}
//var bmDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 10).ToList();
//foreach (var bm in bmDeparts)
//{
// deppartList.Add(bm);
// var cjDepart = departMents.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList();
// if (cjDepart.Any())
// {
// foreach (var cj in cjDepart)
// {
// deppartList.Add(cj);
// var bzDepart = departMents.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList();
// if (bzDepart.Any())
// {
// deppartList.AddRange(bzDepart);
// }
// }
// }
//}
foreach (var set in setList) foreach (var set in setList)
{ {
T_SK_IDENTIFY_EVALUATION_PLAN plan = new T_SK_IDENTIFY_EVALUATION_PLAN(); T_SK_IDENTIFY_EVALUATION_PLAN plan = new T_SK_IDENTIFY_EVALUATION_PLAN();