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

DEPARTMENT_TYPE

Browse Source
This commit is contained in:
wyw 2025-11-20 10:43:13 +08:00
parent 3fd628b64c
commit 93230113a2
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
View File

@ -1776,7 +1776,7 @@ namespace APT.BaseData.Services.Services.FM
else else
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(item); var dep = GetEntity<T_FM_DEPARTMENT>(item);
if (dep != null && depDEPARTMENT_TYPE == 15) if (dep != null && dep.DEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1807,7 +1807,7 @@ namespace APT.BaseData.Services.Services.FM
else else
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(item); var dep = GetEntity<T_FM_DEPARTMENT>(item);
if (dep != null && depDEPARTMENT_TYPE == 15) if (dep != null && dep.DEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1833,7 +1833,7 @@ namespace APT.BaseData.Services.Services.FM
else else
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(item); var dep = GetEntity<T_FM_DEPARTMENT>(item);
if (dep != null && depDEPARTMENT_TYPE == 15) if (dep != null && dep.DEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }

4
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -15857,7 +15857,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else 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<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null) if (dep != null)
@ -15883,7 +15883,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else 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<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null) if (dep != null)

18
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
View File

@ -303,7 +303,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.DEPARTMENT_ID = item.Key.TEAM_ID; completion.DEPARTMENT_ID = item.Key.TEAM_ID;
completion.DEPARTMENT_NAME = item.Key.TeamName; completion.DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; 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_ID = item.Key.CLASS_TEAM_ID;
completion.DEPARTMENT_NAME = item.Key.TeamName; completion.DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; 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_ID = item.Key.TEAM_ID;
completion.DEPARTMENT_NAME = item.Key.TeamName; completion.DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; 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_ID = item.departmetId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; 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_ID = item.departmentId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; 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_ID = item.departmentId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@ -1608,7 +1608,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; 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) foreach (var itemD in depC)
{ {
depNum++; depNum++;
@ -1928,7 +1928,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; 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) foreach (var itemD in depC)
{ {
depNum++; depNum++;
@ -2485,7 +2485,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; depNum = 0;
NUMS = 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) foreach (var itemD in depC)
{ {
depNum++; depNum++;

2
APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs
View File

@ -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(); var classDepartIds = departInfos.Where(t => t.PARENT_ID != null && shopDepartIds.Contains((Guid)t.PARENT_ID)).Select(m => m.ID).ToList();
alldepartIds.AddRange(classDepartIds); 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); alldepartIds.Add((Guid)item.DEPARTMENT_ID);
var classDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList(); var classDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList();

8
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
View File

@ -1317,13 +1317,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{ {
return result; return result;
} }
List<Guid> listDepIDCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量 List<Guid> listDepIDCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量
DateTime dtNow = DateTime.Now; DateTime dtNow = DateTime.Now;
List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
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(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();
T_FM_ENUMS enums = null; T_FM_ENUMS enums = null;
@ -1344,7 +1344,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null); listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null);
if (listDep1MineType != null && listDep1MineType.Any()) 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(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).ToList();
} }
} }
@ -1566,7 +1566,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
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(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
View File

@ -422,7 +422,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
case "1": case "1":
tasks = tasks.Where(t => t.SHOP_DEPARTMENT_ID != null).ToList(); 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; }); 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; break;
case "2": case "2":
tasks = tasks.Where(t => t.CLASS_DEPARTMENT_ID != null).ToList(); 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); 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); express = express.And(t => t.SHOP_DEPARTMENT_ID == departInfo.ID);
} }