From 53889ba0f034eb63ce936ff5a5bc14d8f420ca44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 3 Jun 2026 10:48:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E8=BE=A8=E8=AF=86=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8F=96=E5=85=A8=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SKController.cs | 59 +++++++++++++------ 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 55b6cd4..de96c45 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -1084,30 +1084,55 @@ namespace APT.PP.WebApi.Controllers.Api DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, filter.OrgId.Value, DateTime.Now, null, null); if (setList != null && setList.Any()) { - var departMentTemps = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)).ToList(); - var topDepart = departMentTemps.FirstOrDefault(t => t.PARENT_ID == null); - //deppartList.Add(topDepart); - 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(); - deppartList.AddRange(comDeparts); - var bmDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 10).ToList(); - foreach (var bm in bmDeparts) + var departMentTemps = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(filter.OrgId)).ToList(); + var topDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 5 && t.PARENT_ID == null).OrderBy(t => t.NUM).ToList(); + deppartList.AddRange(topDeparts); + //var departMents = GetSons(departMentTemps, topDepart.ID).OrderBy(t => t.PARENT_ID).ThenBy(t => t.NUM); + var comDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 5 && t.PARENT_ID != null).OrderBy(t => t.NUM).ToList(); + //deppartList.AddRange(comDeparts); + foreach (var cm in comDeparts) { - deppartList.Add(bm); - var cjDepart = departMents.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList(); - if (cjDepart.Any()) + deppartList.Add(cm); + var bmDepart = departMentTemps.Where(t => t.PARENT_ID == cm.ID).OrderBy(t => t.NUM).ToList(); + if (bmDepart.Any()) { - foreach (var cj in cjDepart) + foreach (var bm in bmDepart) { - deppartList.Add(cj); - var bzDepart = departMents.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList(); - if (bzDepart.Any()) - { - deppartList.AddRange(bzDepart); + deppartList.Add(bm); + var cjDepart = departMentTemps.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 = departMentTemps.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList(); + if (bzDepart.Any()) + { + deppartList.AddRange(bzDepart); + } + } } } } } + //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) { T_SK_IDENTIFY_EVALUATION_PLAN plan = new T_SK_IDENTIFY_EVALUATION_PLAN();