From 93230113a295af25eaa81d005efdb2372e3a72db Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Thu, 20 Nov 2025 10:43:13 +0800 Subject: [PATCH] DEPARTMENT_TYPE --- .../Services/FM/FMFlowPermitService.cs | 6 +++--- .../Services/PF/PFApproveCallBackService.cs | 4 ++-- .../Controllers/Api/FMController.cs | 18 +++++++++--------- .../Controllers/Api/PRController.cs | 2 +- .../Api/BIController/BIHomeController.cs | 8 ++++---- .../BIStatiscialAnalysisController.cs | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs index 325ad84..6eb4400 100644 --- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs +++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs @@ -1776,7 +1776,7 @@ namespace APT.BaseData.Services.Services.FM else { var dep = GetEntity(item); - if (dep != null && depDEPARTMENT_TYPE == 15) + if (dep != null && dep.DEPARTMENT_TYPE == 15) { if (dep.USER_ID.HasValue) { approveId = dep.USER_ID.Value; } @@ -1807,7 +1807,7 @@ namespace APT.BaseData.Services.Services.FM else { var dep = GetEntity(item); - if (dep != null && depDEPARTMENT_TYPE == 15) + if (dep != null && dep.DEPARTMENT_TYPE == 15) { if (dep.USER_ID.HasValue) { approveId = dep.USER_ID.Value; } @@ -1833,7 +1833,7 @@ namespace APT.BaseData.Services.Services.FM else { var dep = GetEntity(item); - if (dep != null && depDEPARTMENT_TYPE == 15) + if (dep != null && dep.DEPARTMENT_TYPE == 15) { if (dep.USER_ID.HasValue) { approveId = dep.USER_ID.Value; } diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index d15d2ae..1fb7c5c 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -15857,7 +15857,7 @@ namespace APT.BaseData.Services.DomainServices } else { - if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_TYPE == 15) + if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15) { var dep = GetEntity(user.DEPARTMENT_ID.Value); if (dep != null) @@ -15883,7 +15883,7 @@ namespace APT.BaseData.Services.DomainServices } else { - if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_TYPE == 15) + if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15) { var dep = GetEntity(user.DEPARTMENT_ID.Value); if (dep != null) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs index 234e792..e25f16e 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs @@ -303,7 +303,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP completion.DEPARTMENT_ID = item.Key.TEAM_ID; completion.DEPARTMENT_NAME = item.Key.TeamName; } - if (departInfoDEPARTMENT_TYPE == 15) + if (departInfo.DEPARTMENT_TYPE == 15) { completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; @@ -363,7 +363,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP completion.DEPARTMENT_ID = item.Key.CLASS_TEAM_ID; completion.DEPARTMENT_NAME = item.Key.TeamName; } - if (departInfoDEPARTMENT_TYPE == 15) + if (departInfo.DEPARTMENT_TYPE == 15) { completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; @@ -423,7 +423,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP completion.DEPARTMENT_ID = item.Key.TEAM_ID; completion.DEPARTMENT_NAME = item.Key.TeamName; } - if (departInfoDEPARTMENT_TYPE == 15) + if (departInfo.DEPARTMENT_TYPE == 15) { completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; @@ -937,7 +937,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP completion.DEPARTMENT_ID = item.departmetId; completion.DEPARTMENT_NAME = departInfo?.NAME; } - if (departInfoDEPARTMENT_TYPE == 15) + if (departInfo.DEPARTMENT_TYPE == 15) { completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; @@ -1257,7 +1257,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP completion.DEPARTMENT_ID = item.departmentId; completion.DEPARTMENT_NAME = departInfo?.NAME; } - if (departInfoDEPARTMENT_TYPE == 15) + if (departInfo.DEPARTMENT_TYPE == 15) { completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; @@ -1310,7 +1310,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP completion.DEPARTMENT_ID = item.departmentId; completion.DEPARTMENT_NAME = departInfo?.NAME; } - if (departInfoDEPARTMENT_TYPE == 15) + if (departInfo.DEPARTMENT_TYPE == 15) { completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; @@ -1608,7 +1608,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP //车间 depNum = 0; - var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); + var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); foreach (var itemD in depC) { depNum++; @@ -1928,7 +1928,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP //车间 depNum = 0; - var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); + var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); foreach (var itemD in depC) { depNum++; @@ -2485,7 +2485,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP //车间 depNum = 0; NUMS = 0; - var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); + var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); foreach (var itemD in depC) { depNum++; diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs index 0c7c9d4..a267c8f 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs @@ -860,7 +860,7 @@ namespace APT.PP.WebApi.Controllers.Api var classDepartIds = departInfos.Where(t => t.PARENT_ID != null && shopDepartIds.Contains((Guid)t.PARENT_ID)).Select(m => m.ID).ToList(); alldepartIds.AddRange(classDepartIds); } - if (item != null && item.Nav_Department != null && item.Nav_DepartmentDEPARTMENT_TYPE == 15) + if (item != null && item.Nav_Department != null && item.Nav_Department.DEPARTMENT_TYPE == 15) { alldepartIds.Add((Guid)item.DEPARTMENT_ID); var classDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList(); diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs index 80ec57d..4ba9649 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs @@ -1317,13 +1317,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI { return result; } - List listDepIDCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量 + List listDepIDCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量 DateTime dtNow = DateTime.Now; List listDepCJ = new List(); List listDepBZ = new List(); - listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList(); + listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList(); T_FM_ENUMS enums = null; @@ -1344,7 +1344,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI listDep1MineType = GetEntities(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null); if (listDep1MineType != null && listDep1MineType.Any()) { - listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .ToList(); + listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).ToList(); } } @@ -1566,7 +1566,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI List listDepCJ = new List(); List listDepBZ = new List(); - listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList(); + listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList(); diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs index ffcb5e4..3bfa8eb 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs @@ -422,7 +422,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController case "1": tasks = tasks.Where(t => t.SHOP_DEPARTMENT_ID != null).ToList(); tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.SHOP_DEPARTMENT_ID)?.NAME; }); - departs = departments.Where(t => tDEPARTMENT_TYPE == 15) .OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList(); + departs = departments.Where(t => t.DEPARTMENT_TYPE == 15) .OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList(); break; case "2": tasks = tasks.Where(t => t.CLASS_DEPARTMENT_ID != null).ToList(); @@ -10673,7 +10673,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController { express = express.And(t => t.DEPT_DEPARTMENT_ID == departInfo.ID); } - else if (departInfoDEPARTMENT_TYPE == 15) + else if (departInfo.DEPARTMENT_TYPE == 15) { express = express.And(t => t.SHOP_DEPARTMENT_ID == departInfo.ID); }