diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index ac03f0a..2fffca8 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -232,18 +232,18 @@ namespace APT.PP.WebApi.Controllers.Api var departContent = libraryNoPost.Where(t => t.MineType == group.Key.MineType && t.CHECK_TYPE_ID == group.Key.CHECK_TYPE_ID && t.CHECK_CYCLE == group.Key.CHECK_CYCLE && t.CHECK_TYPE == group.Key.CHECK_TYPE).ToList(); var contentIds = departContent.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList(); var content = libraryContents.Where(t => contentIds.Contains(t.ID)).ToList(); - var departList = departs.Where(t => t.DEPARTMENT_TYPE == 0).ToList(); + var departList = departs.Where(t => t.DEPARTMENT_TYPE == 10).ToList(); if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.部门级) { - departList = departs.Where(t => t.DEPARTMENT_TYPE == 0).ToList(); + departList = departs.Where(t => t.DEPARTMENT_TYPE == 10).ToList(); } if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.车间级) { - departList = departs.Where(t => t.DEPARTMENT_TYPE == 1).ToList(); + departList = departs.Where(t => t.DEPARTMENT_TYPE == 15).ToList(); } if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.班组级) { - departList = departs.Where(t => t.DEPARTMENT_TYPE == 2 && teamDepartIds.Contains(t.ID)).ToList(); + departList = departs.Where(t => t.DEPARTMENT_TYPE == 20 && teamDepartIds.Contains(t.ID)).ToList(); } if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.公司级) { @@ -911,9 +911,9 @@ namespace APT.PP.WebApi.Controllers.Api 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 == 3).ToList(); + var comDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 5).ToList(); deppartList.AddRange(comDeparts); - var bmDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 0).ToList(); + var bmDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 10).ToList(); foreach (var bm in bmDeparts) { deppartList.Add(bm); @@ -1608,7 +1608,7 @@ namespace APT.PP.WebApi.Controllers.Api if (departIds.Any()) { //部门级给部门安全员 - var departClass = departs.Where(t => departIds.Contains(t.ID) && (t.DEPARTMENT_TYPE == 0 || t.DEPARTMENT_TYPE == 3)).ToList(); + var departClass = departs.Where(t => departIds.Contains(t.ID) && (t.DEPARTMENT_TYPE == 10 || t.DEPARTMENT_TYPE == 5)).ToList(); if (departClass.Any()) { var tempIds = departClass.Select(t => t.ID).ToList(); @@ -1742,11 +1742,11 @@ namespace APT.PP.WebApi.Controllers.Api } } //车间级和班组级汇总给车间安全员 - var shopClass = departs.Where(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 1).ToList(); + var shopClass = departs.Where(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 15).ToList(); if (shopClass.Any()) { var tempIds = shopClass.Select(t => t.ID).ToList(); - var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 2).ToList(); + var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 20).ToList(); if (tempIds.Any()) { //每个车间汇总班组和车间 @@ -3076,7 +3076,7 @@ namespace APT.PP.WebApi.Controllers.Api if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor) { //发给班长 - var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 2 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); + var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); userIds.AddRange(userTempIds); } //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post) @@ -4638,7 +4638,7 @@ namespace APT.PP.WebApi.Controllers.Api if (item.FirstOrDefault().PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor) { //发给班长 - var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 2 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); + var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); userIds.AddRange(userTempIds); } //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post)