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

DEPARTMENT_TYPE 修改 部门=0, 车间=1, 班组=2, 公司=3 = > 公司=5 部门=10, 车间=15, 班组=20,

Browse Source
This commit is contained in:
wyw 2025-11-20 10:14:24 +08:00
parent 6ff810eba7
commit 4a85489f27
42 changed files with 229 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APT.BaseData.Services/Services/FM/FMDepartmentService.cs
View File

@ -107,15 +107,15 @@ namespace APT.BaseData.Services.Services.FM
if (DepartmentID != Guid.Empty) if (DepartmentID != Guid.Empty)
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(DepartmentID, new string[] { "Nav_Parent" }); var dep = GetEntity<T_FM_DEPARTMENT>(DepartmentID, new string[] { "Nav_Parent" });
if (dep.DEPARTMENT_TYPE == 0)//FMDepartmentType.部门 3 公司//FMDepartmentType.公司 if (dep.DEPARTMENT_TYPE == 10)//FMDepartmentType.部门 3 公司//FMDepartmentType.公司
{ {
return dep; return dep;
} }
else if (dep.DEPARTMENT_TYPE == 3) else if (dep.DEPARTMENT_TYPE == 5)
{ {
return dep; return dep;
} }
else if (dep.Nav_Parent.DEPARTMENT_TYPE == 0) else if (dep.Nav_Parent.DEPARTMENT_TYPE == 10)
{ {
return dep.Nav_Parent; return dep.Nav_Parent;
} }
@ -143,7 +143,7 @@ namespace APT.BaseData.Services.Services.FM
public T_FM_DEPARTMENT GetRSDep(string DepName = "企业管理部", params string[] paths) public T_FM_DEPARTMENT GetRSDep(string DepName = "企业管理部", params string[] paths)
{ {
T_FM_DEPARTMENT result = new T_FM_DEPARTMENT(); T_FM_DEPARTMENT result = new T_FM_DEPARTMENT();
result = GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 0 && e.NAME.Contains(DepName), paths == null ? paths : null);//部门级 result = GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 10 && e.NAME.Contains(DepName), paths == null ? paths : null);//部门级
return result; return result;
} }
/// <summary> /// <summary>

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

@ -1589,7 +1589,7 @@ namespace APT.BaseData.Services.Services.FM
{ {
if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人") if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人")
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0); var dep = GetEntity<T_FM_DEPARTMENT>(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 10 && t.ENABLE_STATUS == 0);
if (dep != null) if (dep != null)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
@ -1652,7 +1652,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 && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1683,7 +1683,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 && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1714,7 +1714,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 && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1745,7 +1745,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 && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -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 && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_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 && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_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 && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }

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

@ -912,7 +912,7 @@ namespace APT.BaseData.Services.DomainServices
//modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID; //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID;
if (item.CREATER_ID == depMainCheck.USER_ID) if (item.CREATER_ID == depMainCheck.USER_ID)
{ {
if (depMainCheck.DEPARTMENT_TYPE == 2) if (depMainCheck.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -995,7 +995,7 @@ namespace APT.BaseData.Services.DomainServices
//modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID; //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID;
if (item.CREATER_ID == depMainCheck.USER_ID) if (item.CREATER_ID == depMainCheck.USER_ID)
{ {
if (depMainCheck.DEPARTMENT_TYPE == 2) if (depMainCheck.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -1084,7 +1084,7 @@ namespace APT.BaseData.Services.DomainServices
// //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID; // //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID;
// if (item.CREATER_ID == depMainCheck.USER_ID) // if (item.CREATER_ID == depMainCheck.USER_ID)
// { // {
// if (depMainCheck.DEPARTMENT_TYPE == 2) // if (depMainCheck.DEPARTMENT_TYPE == 20)
// { // {
// RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; // RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
// } // }
@ -1256,7 +1256,7 @@ namespace APT.BaseData.Services.DomainServices
var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value);
if (dep.USER_ID == content.USER_ID) if (dep.USER_ID == content.USER_ID)
{ {
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -1316,7 +1316,7 @@ namespace APT.BaseData.Services.DomainServices
var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value);
if (dep.USER_ID == content.USER_ID) if (dep.USER_ID == content.USER_ID)
{ {
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -1407,7 +1407,7 @@ namespace APT.BaseData.Services.DomainServices
var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value);
if (dep.USER_ID == content.USER_ID) if (dep.USER_ID == content.USER_ID)
{ {
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -1748,7 +1748,7 @@ namespace APT.BaseData.Services.DomainServices
} }
//if (item.CREATER_ID == depMainCheck.USER_ID) //if (item.CREATER_ID == depMainCheck.USER_ID)
//{ //{
// if (depMainCheck.DEPARTMENT_TYPE == 2) // if (depMainCheck.DEPARTMENT_TYPE == 20)
// { // {
// modelAdd.RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; // modelAdd.RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
// } // }
@ -8721,7 +8721,7 @@ namespace APT.BaseData.Services.DomainServices
} }
//if (item.CREATER_ID == depMainCheck.USER_ID) //if (item.CREATER_ID == depMainCheck.USER_ID)
//{ //{
// if (depMainCheck.DEPARTMENT_TYPE == 2) // if (depMainCheck.DEPARTMENT_TYPE == 20)
// { // {
// modelAdd.RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; // modelAdd.RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
// } // }
@ -9359,7 +9359,7 @@ namespace APT.BaseData.Services.DomainServices
//modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID; //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID;
if (item.CREATER_ID == depMainCheck.USER_ID) if (item.CREATER_ID == depMainCheck.USER_ID)
{ {
if (depMainCheck.DEPARTMENT_TYPE == 2) if (depMainCheck.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -9443,7 +9443,7 @@ namespace APT.BaseData.Services.DomainServices
//modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID; //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID;
if (item.CREATER_ID == depMainCheck.USER_ID) if (item.CREATER_ID == depMainCheck.USER_ID)
{ {
if (depMainCheck.DEPARTMENT_TYPE == 2) if (depMainCheck.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -9532,7 +9532,7 @@ namespace APT.BaseData.Services.DomainServices
// //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID; // //modelAdd.DEPARTMENT_ID = item.DEPARTMENT_ID;
// if (item.CREATER_ID == depMainCheck.USER_ID) // if (item.CREATER_ID == depMainCheck.USER_ID)
// { // {
// if (depMainCheck.DEPARTMENT_TYPE == 2) // if (depMainCheck.DEPARTMENT_TYPE == 20)
// { // {
// RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; // RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
// } // }
@ -9789,7 +9789,7 @@ namespace APT.BaseData.Services.DomainServices
var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value);
if (dep.USER_ID == content.USER_ID) if (dep.USER_ID == content.USER_ID)
{ {
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -9849,7 +9849,7 @@ namespace APT.BaseData.Services.DomainServices
var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value);
if (dep.USER_ID == content.USER_ID) if (dep.USER_ID == content.USER_ID)
{ {
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -9940,7 +9940,7 @@ namespace APT.BaseData.Services.DomainServices
var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(content.DEPARTMENT_ID.Value);
if (dep.USER_ID == content.USER_ID) if (dep.USER_ID == content.USER_ID)
{ {
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
} }
@ -12922,7 +12922,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 20) else if (currentDepart.DEPARTMENT_TYPE == 200)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
departIds.Add((Guid)parentId); departIds.Add((Guid)parentId);
@ -13321,7 +13321,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 20) else if (currentDepart.DEPARTMENT_TYPE == 200)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -13819,7 +13819,7 @@ namespace APT.BaseData.Services.DomainServices
var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList(); var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(classIds); departIds.AddRange(classIds);
} }
else if (currentDepart.DEPARTMENT_TYPE == 20) else if (currentDepart.DEPARTMENT_TYPE == 200)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -14256,7 +14256,7 @@ namespace APT.BaseData.Services.DomainServices
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds); //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
} }
else if (currentDepart.DEPARTMENT_TYPE == 20) else if (currentDepart.DEPARTMENT_TYPE == 200)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -15677,7 +15677,7 @@ namespace APT.BaseData.Services.DomainServices
{ {
if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人") if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人")
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0); var dep = GetEntity<T_FM_DEPARTMENT>(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 10 && t.ENABLE_STATUS == 0);
if (dep != null) if (dep != null)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
@ -15739,7 +15739,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 10)
{ {
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)
@ -15765,7 +15765,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 10)
{ {
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)
@ -15798,7 +15798,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 10)
{ {
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)
@ -15824,7 +15824,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 10)
{ {
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)
@ -15857,7 +15857,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 1) if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_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_Department.DEPARTMENT_TYPE == 1) if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_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)

4
APT.MS.Services/Services/SC/BI/BIBSSafeCheckService.cs
View File

@ -152,7 +152,7 @@ namespace APT.BaseData.Services.DomainServices
//{ //{
// //FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3 // //FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3
// listDepID = listSafeChecks.Select(e => e.DEPARTMENTID.Value).Distinct().ToList(); // listDepID = listSafeChecks.Select(e => e.DEPARTMENTID.Value).Distinct().ToList();
// var listDep = GetEntities<T_FM_DEPARTMENT>(e => listDepID.Contains(e.ID) && e.DEPARTMENT_TYPE == 2).OrderBy(e => e.NAME); // var listDep = GetEntities<T_FM_DEPARTMENT>(e => listDepID.Contains(e.ID) && e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NAME);
// foreach (var item in listDep) // foreach (var item in listDep)
// { // {
// if (!listTeam.Contains(item)) // if (!listTeam.Contains(item))
@ -203,7 +203,7 @@ namespace APT.BaseData.Services.DomainServices
{ {
//FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3 //FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3
listDepID = listSafeChecks.Where(e => e.CHECKOBJECT == CHECKOBJECT).Select(e => e.DEPARTMENTID.Value).Distinct().ToList(); listDepID = listSafeChecks.Where(e => e.CHECKOBJECT == CHECKOBJECT).Select(e => e.DEPARTMENTID.Value).Distinct().ToList();
var listDep = GetEntities<T_FM_DEPARTMENT>(e => listDepID.Contains(e.ID) && e.DEPARTMENT_TYPE == 2).OrderBy(e => e.NAME); var listDep = GetEntities<T_FM_DEPARTMENT>(e => listDepID.Contains(e.ID) && e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NAME);
foreach (var item in listDep) foreach (var item in listDep)
{ {
if (!listTeam.Contains(item)) if (!listTeam.Contains(item))

16
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
View File

@ -4816,7 +4816,7 @@ namespace APT.BS.WebApi.Controllers.Api
//if (master.Nav_Department.USER_ID.HasValue && master.Nav_Department.USER_ID.Value == entity.USER_ID.Value) //if (master.Nav_Department.USER_ID.HasValue && master.Nav_Department.USER_ID.Value == entity.USER_ID.Value)
//{ //{
// //自己就是负责人 找上级组织的安全员 // //自己就是负责人 找上级组织的安全员
// if (master.Nav_Department.DEPARTMENT_TYPE == 0 || master.Nav_Department.DEPARTMENT_TYPE == 3) //部门 公司 // if (master.Nav_Department.DEPARTMENT_TYPE == 10 || master.Nav_Department.DEPARTMENT_TYPE == 5) //部门 公司
// { // {
// //var userSafe = GetEntity<T_FM_USER>(e => !e.IS_DELETED && e.DEPARTMENT_ID == master.Nav_Department.PARENT_ID && e.Nav_ApproveRole.NAME.Contains("安环部安全员")); // //var userSafe = GetEntity<T_FM_USER>(e => !e.IS_DELETED && e.DEPARTMENT_ID == master.Nav_Department.PARENT_ID && e.Nav_ApproveRole.NAME.Contains("安环部安全员"));
// //if (userSafe != null) // //if (userSafe != null)
@ -4827,7 +4827,7 @@ namespace APT.BS.WebApi.Controllers.Api
// //部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3 // //部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3
// //如果是公司级 或者安环部 就是自己 // //如果是公司级 或者安环部 就是自己
// if (master.Nav_Department.DEPARTMENT_TYPE == 3 || master.Nav_Department.DEPARTMENT_STATUS == 2) // if (master.Nav_Department.DEPARTMENT_TYPE == 5 || master.Nav_Department.DEPARTMENT_STATUS == 2)
// { // {
// UserId = entity.USER_ID.Value; // UserId = entity.USER_ID.Value;
// userName = master.NAME; // userName = master.NAME;
@ -4855,7 +4855,7 @@ namespace APT.BS.WebApi.Controllers.Api
//else //else
//{ //{
// // 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 // // 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
// if (master.Nav_Department.DEPARTMENT_TYPE == 2) // if (master.Nav_Department.DEPARTMENT_TYPE == 20)
// { // {
// if (master.Nav_Department.USER_ID.HasValue) // if (master.Nav_Department.USER_ID.HasValue)
// { // {
@ -4904,7 +4904,7 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
//找安全员 如果没有 找负责人 //找安全员 如果没有 找负责人
// 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 // 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (master.Nav_Department.DEPARTMENT_TYPE == 2) if (master.Nav_Department.DEPARTMENT_TYPE == 20)
{ {
if (master.Nav_Department.USER_ID.HasValue) if (master.Nav_Department.USER_ID.HasValue)
{ {
@ -6293,7 +6293,7 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
//找安全员 如果没有 找负责人 //找安全员 如果没有 找负责人
// 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 // 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (master.Nav_Department.DEPARTMENT_TYPE == 2) if (master.Nav_Department.DEPARTMENT_TYPE == 20)
{ {
if (master.Nav_Department.USER_ID.HasValue) if (master.Nav_Department.USER_ID.HasValue)
{ {
@ -6607,7 +6607,7 @@ namespace APT.BS.WebApi.Controllers.Api
////[Description("部门层级")] FMDepartmentType 部门 = 0,// 车间 = 1, // 班组 = 2, //公司 = 3 ////[Description("部门层级")] FMDepartmentType 部门 = 0,// 车间 = 1, // 班组 = 2, //公司 = 3
//var depID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; //var depID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value;
//var depLoginDep = GetEntity<T_FM_DEPARTMENT>(depID); //var depLoginDep = GetEntity<T_FM_DEPARTMENT>(depID);
//if (depLoginDep.DEPARTMENT_TYPE == 2) //if (depLoginDep.DEPARTMENT_TYPE == 20)
//{ //{
// depID = depLoginDep.PARENT_ID.Value; // depID = depLoginDep.PARENT_ID.Value;
//} //}
@ -7921,7 +7921,7 @@ namespace APT.BS.WebApi.Controllers.Api
else else
{ {
int DEPARTMENT_TYPE = depLoginDep.DEPARTMENT_TYPE; int DEPARTMENT_TYPE = depLoginDep.DEPARTMENT_TYPE;
if (depLoginDep.DEPARTMENT_TYPE == 2) if (depLoginDep.DEPARTMENT_TYPE == 20)
{ {
depID = depLoginDep.PARENT_ID.Value; depID = depLoginDep.PARENT_ID.Value;
} }
@ -8558,7 +8558,7 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
//找安全员 如果没有 找负责人 //找安全员 如果没有 找负责人
// 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 // 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (master.Nav_Department.DEPARTMENT_TYPE == 2) if (master.Nav_Department.DEPARTMENT_TYPE == 20)
{ {
if (master.Nav_Department.USER_ID.HasValue) if (master.Nav_Department.USER_ID.HasValue)
{ {

12
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
View File

@ -639,7 +639,7 @@ namespace APT.BS.WebApi.Controllers.Api
// //else if (userLogin.Nav_ApproveRole.NAME.Contains("负责人")) // //else if (userLogin.Nav_ApproveRole.NAME.Contains("负责人"))
// //{ // //{
// // //部门=0, 车间=1, 班组=2, 公司=3 // // //部门=0, 车间=1, 班组=2, 公司=3
// // if (userLogin.Nav_Department.DEPARTMENT_TYPE == 2) // // if (userLogin.Nav_Department.DEPARTMENT_TYPE == 20)
// // { // // {
// // expression = expression.And(e => e.RESPONOBJECT == BSPLANCHECKOBJECTEnum.ClassMonitor && e.DEPARTMENT_ID == userLogin.DEPARTMENT_ID); // // expression = expression.And(e => e.RESPONOBJECT == BSPLANCHECKOBJECTEnum.ClassMonitor && e.DEPARTMENT_ID == userLogin.DEPARTMENT_ID);
// // } // // }
@ -680,7 +680,7 @@ namespace APT.BS.WebApi.Controllers.Api
// //else if (userLogin.Nav_ApproveRole.NAME.Contains("负责人")) // //else if (userLogin.Nav_ApproveRole.NAME.Contains("负责人"))
// //{ // //{
// // //部门=0, 车间=1, 班组=2, 公司=3 // // //部门=0, 车间=1, 班组=2, 公司=3
// // if (userLogin.Nav_Department.DEPARTMENT_TYPE == 2) // // if (userLogin.Nav_Department.DEPARTMENT_TYPE == 20)
// // { // // {
// // RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; // // RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
// // } // // }
@ -2210,7 +2210,7 @@ namespace APT.BS.WebApi.Controllers.Api
// //BSPLANCHECKOBJECTEnum RESPONOBJECT = BSPLANCHECKOBJECTEnum.Head; // //BSPLANCHECKOBJECTEnum RESPONOBJECT = BSPLANCHECKOBJECTEnum.Head;
// //if (dep.USER_ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value) // //if (dep.USER_ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value)
// //{ // //{
// // if (dep.DEPARTMENT_TYPE == 2) // // if (dep.DEPARTMENT_TYPE == 20)
// // { // // {
// // RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor; // // RESPONOBJECT = BSPLANCHECKOBJECTEnum.ClassMonitor;
// // } // // }
@ -6674,7 +6674,7 @@ namespace APT.BS.WebApi.Controllers.Api
List<Guid> listRoleID = new List<Guid>(); List<Guid> listRoleID = new List<Guid>();
foreach (var item in listApproveDetail) foreach (var item in listApproveDetail)
{ {
if (item.APPROVE_ROLE_ID.HasValue && item.Nav_ApproveRole.DEPARTMENT_TYPE == 3 && !item.DEFAULT_APPROVE_USER_ID.HasValue) if (item.APPROVE_ROLE_ID.HasValue && item.Nav_ApproveRole.DEPARTMENT_TYPE == 5 && !item.DEFAULT_APPROVE_USER_ID.HasValue)
{ {
listRoleID.Add(item.APPROVE_ROLE_ID.Value); listRoleID.Add(item.APPROVE_ROLE_ID.Value);
} }
@ -6687,7 +6687,7 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
foreach (var item in listApproveDetail) foreach (var item in listApproveDetail)
{ {
if (item.APPROVE_ROLE_ID.HasValue && item.Nav_ApproveRole.DEPARTMENT_TYPE == 3 && !item.DEFAULT_APPROVE_USER_ID.HasValue) if (item.APPROVE_ROLE_ID.HasValue && item.Nav_ApproveRole.DEPARTMENT_TYPE == 5 && !item.DEFAULT_APPROVE_USER_ID.HasValue)
{ {
modelUser = listUserSpecial.FirstOrDefault(e => e.APPROVE_ROLE_ID == item.APPROVE_ROLE_ID); modelUser = listUserSpecial.FirstOrDefault(e => e.APPROVE_ROLE_ID == item.APPROVE_ROLE_ID);
if (modelUser != null) if (modelUser != null)
@ -9354,7 +9354,7 @@ namespace APT.BS.WebApi.Controllers.Api
if (depPer != null) if (depPer != null)
{ {
cellORG.SetCellValue(((FMDepartmentType)depPer.DEPARTMENT_TYPE).GetDescription() + "名称"); //depPer.DEPARTMENT_TYPE == 0; 部门=0, 车间=1, 班组=2, 公司=3 cellORG.SetCellValue(((FMDepartmentType)depPer.DEPARTMENT_TYPE).GetDescription() + "名称"); //depPer.DEPARTMENT_TYPE == 10; 部门=0, 车间=1, 班组=2, 公司=3
} }
else else
{ {

2
APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
View File

@ -775,7 +775,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
if (modelP == null) if (modelP == null)
{ {
//新增外包初始节点 //新增外包初始节点
var root = GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 3 && e.ENABLE_STATUS == 0); var root = GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 5 && e.ENABLE_STATUS == 0);
string depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; string depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
string ORG_ID = entity.ORG_ID.Value.ToString().ToUpper(); string ORG_ID = entity.ORG_ID.Value.ToString().ToUpper();

2
APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs
View File

@ -283,7 +283,7 @@ namespace APT.FM.WebApi.Controllers.Api
if (loginDepartmentId != null) if (loginDepartmentId != null)
{ {
var depart = this.GetEntity<T_FM_DEPARTMENT>(loginDepartmentId.ToString()); var depart = this.GetEntity<T_FM_DEPARTMENT>(loginDepartmentId.ToString());
if (depart.DEPARTMENT_TYPE == 2 && depart.USER_ID != loginUserId) if (depart.DEPARTMENT_TYPE == 20 && depart.USER_ID != loginUserId)
{ {
DataOrder order2 = new DataOrder(); DataOrder order2 = new DataOrder();
order2.Field = "TASK_STARTDT"; order2.Field = "TASK_STARTDT";

12
APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
View File

@ -193,7 +193,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
pageFilter.FilterGroup.Rules.Clear(); pageFilter.FilterGroup.Rules.Clear();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(orgId)); var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(orgId));
var depart = departs.FirstOrDefault(t => t.ID == loginDepartmentId); var depart = departs.FirstOrDefault(t => t.ID == loginDepartmentId);
if (depart != null && depart.DEPARTMENT_TYPE == 2) if (depart != null && depart.DEPARTMENT_TYPE == 20)
{ {
selectDepatmentIds = departs.Where(t => t.PARENT_ID == depart.PARENT_ID).Select(m => m.ID).ToList(); selectDepatmentIds = departs.Where(t => t.PARENT_ID == depart.PARENT_ID).Select(m => m.ID).ToList();
} }
@ -214,7 +214,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
pageFilter.FilterGroup.Rules.Clear(); pageFilter.FilterGroup.Rules.Clear();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(orgId)); var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(orgId));
var depart = departs.FirstOrDefault(t => t.ID == loginDepartmentId); var depart = departs.FirstOrDefault(t => t.ID == loginDepartmentId);
if (depart != null && depart.DEPARTMENT_TYPE == 2) if (depart != null && depart.DEPARTMENT_TYPE == 20)
{ {
selectDepatmentIds = departs.Where(t => t.PARENT_ID == depart.PARENT_ID).Select(m => m.ID).ToList(); selectDepatmentIds = departs.Where(t => t.PARENT_ID == depart.PARENT_ID).Select(m => m.ID).ToList();
} }
@ -326,7 +326,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
var result = new PagedActionResult<T_FM_USER>(); var result = new PagedActionResult<T_FM_USER>();
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var admiId = this.GetEntity<T_FM_USER>(t => t.CODE == "admin")?.ID; var admiId = this.GetEntity<T_FM_USER>(t => t.CODE == "admin")?.ID;
var AH = GetEntity<T_FM_USER>(t => t.NAME != null && t.ID == loginUserId && t.Nav_Department != null && (t.Nav_Department.DEPARTMENT_TYPE == 0 || t.Nav_Department.DEPARTMENT_TYPE == 3) && (t.Nav_Department.NAME.Contains("安全环保") || t.Nav_Department.NAME.Contains("安环"))); var AH = GetEntity<T_FM_USER>(t => t.NAME != null && t.ID == loginUserId && t.Nav_Department != null && (t.Nav_Department.DEPARTMENT_TYPE == 10 || t.Nav_Department.DEPARTMENT_TYPE == 5) && (t.Nav_Department.NAME.Contains("安全环保") || t.Nav_Department.NAME.Contains("安环")));
if (loginUserId == null || loginUserId == admiId || AH != null) if (loginUserId == null || loginUserId == admiId || AH != null)
{ {
result = WitOrderPaged(null, pageFilter); ; result = WitOrderPaged(null, pageFilter); ;
@ -791,11 +791,11 @@ namespace APT.FM.WebApi.Controllers.Api.FM
// { // {
// var userPostFirst = this.GetEntity<T_FM_USER_POST>(t => t.ID == entity.Nav_Person.POST_ID); // var userPostFirst = this.GetEntity<T_FM_USER_POST>(t => t.ID == entity.Nav_Person.POST_ID);
// var sendUser = allUsers.FirstOrDefault(t => t.DEPARTMENT_ID == departmentInfo.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员")); // var sendUser = allUsers.FirstOrDefault(t => t.DEPARTMENT_ID == departmentInfo.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
// if (departmentInfo.DEPARTMENT_TYPE == 2) // if (departmentInfo.DEPARTMENT_TYPE == 20)
// { // {
// sendUser = allUsers.FirstOrDefault(t => t.ID == departmentInfo.USER_ID); // sendUser = allUsers.FirstOrDefault(t => t.ID == departmentInfo.USER_ID);
// } // }
// if (departmentInfo.DEPARTMENT_TYPE == 1 ) // if (departmentInfo.DEPARTMENT_TYPE == 15 )
// { // {
// sendUser = allUsers.FirstOrDefault(t => t.DEPARTMENT_ID == departmentInfo.ID && t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME.Contains("安全员")); // sendUser = allUsers.FirstOrDefault(t => t.DEPARTMENT_ID == departmentInfo.ID && t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME.Contains("安全员"));
// if (sendUser == null) // if (sendUser == null)
@ -803,7 +803,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
// sendUser = allUsers.FirstOrDefault(t => t.DEPARTMENT_ID == departmentInfo.PARENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员")); // sendUser = allUsers.FirstOrDefault(t => t.DEPARTMENT_ID == departmentInfo.PARENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
// } // }
// } // }
// if (departmentInfo.DEPARTMENT_TYPE == 3) // if (departmentInfo.DEPARTMENT_TYPE == 5)
// { // {
// sendUser = allUsers.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员")); // sendUser = allUsers.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
// } // }

18
APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
View File

@ -130,11 +130,11 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value); dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value);
} }
if (DataHelper.GetRequestType(HttpContext.Request.Headers) == 2 && LoginDepID.HasValue && dep != null && (dep.DEPARTMENT_TYPE == 1 || dep.DEPARTMENT_TYPE == 2)) if (DataHelper.GetRequestType(HttpContext.Request.Headers) == 2 && LoginDepID.HasValue && dep != null && (dep.DEPARTMENT_TYPE == 15 || dep.DEPARTMENT_TYPE == 20))
{ {
//班组或者车间 向下取值 否则取全部 //班组或者车间 向下取值 否则取全部
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
return WitOrderPaged(e => e.ENABLE_STATUS == 0 && !e.PROJECT_ID.HasValue && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter); return WitOrderPaged(e => e.ENABLE_STATUS == 0 && !e.PROJECT_ID.HasValue && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter);
} }
@ -220,10 +220,10 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
//班组或者车间 向下取值 否则取全部 //班组或者车间 向下取值 否则取全部
dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value); dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value);
if (dep != null && (dep.DEPARTMENT_TYPE == 1 || dep.DEPARTMENT_TYPE == 2)) if (dep != null && (dep.DEPARTMENT_TYPE == 15 || dep.DEPARTMENT_TYPE == 20))
{ {
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
return WitOrderPaged(e => e.ENABLE_STATUS == 0 && !e.PROJECT_ID.HasValue && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter); return WitOrderPaged(e => e.ENABLE_STATUS == 0 && !e.PROJECT_ID.HasValue && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter);
} }
@ -470,11 +470,11 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value); dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value);
} }
if (DataHelper.GetRequestType(HttpContext.Request.Headers) == 2 && LoginDepID.HasValue && dep != null && (dep.DEPARTMENT_TYPE == 1 || dep.DEPARTMENT_TYPE == 2)) if (DataHelper.GetRequestType(HttpContext.Request.Headers) == 2 && LoginDepID.HasValue && dep != null && (dep.DEPARTMENT_TYPE == 15 || dep.DEPARTMENT_TYPE == 20))
{ {
//班组或者车间 向下取值 否则取全部 //班组或者车间 向下取值 否则取全部
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
return WitOrderPaged(e => e.ENABLE_STATUS == 0 && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter); return WitOrderPaged(e => e.ENABLE_STATUS == 0 && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter);
} }
@ -560,10 +560,10 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
//班组或者车间 向下取值 否则取全部 //班组或者车间 向下取值 否则取全部
dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value); dep = GetEntity<T_FM_DEPARTMENT>(LoginDepID.Value);
if (dep != null && (dep.DEPARTMENT_TYPE == 1 || dep.DEPARTMENT_TYPE == 2)) if (dep != null && (dep.DEPARTMENT_TYPE == 15 || dep.DEPARTMENT_TYPE == 20))
{ {
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (dep.DEPARTMENT_TYPE == 2) if (dep.DEPARTMENT_TYPE == 20)
{ {
return WitOrderPaged(e => e.ENABLE_STATUS == 0 && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter); return WitOrderPaged(e => e.ENABLE_STATUS == 0 && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == LoginDepID.Value && e.CODE != "admin", pageFilter);
} }
@ -1132,7 +1132,7 @@ namespace APT.BS.WebApi.Controllers.Api
modelDep20.CREATE_TIME = dtNow; modelDep20.CREATE_TIME = dtNow;
if (string.IsNullOrEmpty(modelDep20.CODE)) if (string.IsNullOrEmpty(modelDep20.CODE))
{ {
modelDep20.CODE = modelDep15.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 20).Count() + 1).ToString().PadLeft(2, '0'); modelDep20.CODE = modelDep15.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 200).Count() + 1).ToString().PadLeft(2, '0');
} }
listDepAdd.Add(modelDep20); listDepAdd.Add(modelDep20);

18
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -898,7 +898,7 @@ namespace APT.FO.WebApi.Controllers
GetDepartmentId((Guid)entity.TERRITORY_DEPARTMENT_ID, ref departmentIds); GetDepartmentId((Guid)entity.TERRITORY_DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any()) if (departmentIds.Any())
{ {
var dep = departs.FirstOrDefault(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 0); var dep = departs.FirstOrDefault(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 10);
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue) else if (dep.CHARGEUSER_ID.HasValue)
@ -926,7 +926,7 @@ namespace APT.FO.WebApi.Controllers
{ {
if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人") if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人")
{ {
var dep = departs.FirstOrDefault(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0); var dep = departs.FirstOrDefault(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 10 && t.ENABLE_STATUS == 0);
if (dep != null) if (dep != null)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
@ -989,7 +989,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t=>t.ID == item); var dep = departs.FirstOrDefault(t=>t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1020,7 +1020,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1051,7 +1051,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1082,7 +1082,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1113,7 +1113,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1144,7 +1144,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1170,7 +1170,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }

18
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
View File

@ -609,7 +609,7 @@ namespace APT.FO.WebApi.Controllers
GetDepartmentId((Guid)entity.TERRITORY_DEPARTMENT_ID, ref departmentIds); GetDepartmentId((Guid)entity.TERRITORY_DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any()) if (departmentIds.Any())
{ {
var dep = departs.FirstOrDefault(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 0); var dep = departs.FirstOrDefault(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 10);
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue) else if (dep.CHARGEUSER_ID.HasValue)
@ -637,7 +637,7 @@ namespace APT.FO.WebApi.Controllers
{ {
if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人") if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人")
{ {
var dep = departs.FirstOrDefault(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0); var dep = departs.FirstOrDefault(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 10 && t.ENABLE_STATUS == 0);
if (dep != null) if (dep != null)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
@ -700,7 +700,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -731,7 +731,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -762,7 +762,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -793,7 +793,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 0) if (dep != null && dep.DEPARTMENT_TYPE == 10)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -824,7 +824,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -855,7 +855,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -881,7 +881,7 @@ namespace APT.FO.WebApi.Controllers
else else
{ {
var dep = departs.FirstOrDefault(t => t.ID == item); var dep = departs.FirstOrDefault(t => t.ID == item);
if (dep != null && dep.DEPARTMENT_TYPE == 1) if (dep != null && depDEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }

12
APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIAnalysisController.cs
View File

@ -3478,18 +3478,18 @@ namespace APT.PP.WebApi.Controllers.Api.PP
if (depart != null) if (depart != null)
{ {
task.DEPARTMENT_ID = depart.ID; task.DEPARTMENT_ID = depart.ID;
if (depart.DEPARTMENT_TYPE == 2) if (depart.DEPARTMENT_TYPE == 20)
{ {
task.CLASS_DEPARTMENT_ID = depart.ID; task.CLASS_DEPARTMENT_ID = depart.ID;
task.SHOP_DEPARTMENT_ID = depart.PARENT_ID; task.SHOP_DEPARTMENT_ID = depart.PARENT_ID;
task.DEPT_DEPARTMENT_ID = depart.Nav_Parent?.PARENT_ID; task.DEPT_DEPARTMENT_ID = depart.Nav_Parent?.PARENT_ID;
} }
else if (depart.DEPARTMENT_TYPE == 1) else if (departDEPARTMENT_TYPE == 15)
{ {
task.SHOP_DEPARTMENT_ID = depart.ID; task.SHOP_DEPARTMENT_ID = depart.ID;
task.DEPT_DEPARTMENT_ID = depart.PARENT_ID; task.DEPT_DEPARTMENT_ID = depart.PARENT_ID;
} }
else if (depart.DEPARTMENT_TYPE == 0) else if (depart.DEPARTMENT_TYPE == 10)
{ {
task.DEPT_DEPARTMENT_ID = depart.ID; task.DEPT_DEPARTMENT_ID = depart.ID;
} }
@ -3847,19 +3847,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var depart = departmentInfos.FirstOrDefault(m => m.ID == user.DEPARTMENT_ID); var depart = departmentInfos.FirstOrDefault(m => m.ID == user.DEPARTMENT_ID);
if (depart != null) if (depart != null)
{ {
if (depart.DEPARTMENT_TYPE == 2) if (depart.DEPARTMENT_TYPE == 20)
{ {
task.CLASS_DEPARTMENT_ID = depart.ID; task.CLASS_DEPARTMENT_ID = depart.ID;
task.SHOP_DEPARTMENT_ID = depart.PARENT_ID; task.SHOP_DEPARTMENT_ID = depart.PARENT_ID;
task.DEPT_DEPARTMENT_ID = depart.Nav_Parent?.PARENT_ID; task.DEPT_DEPARTMENT_ID = depart.Nav_Parent?.PARENT_ID;
} }
else if (depart.DEPARTMENT_TYPE == 1) else if (departDEPARTMENT_TYPE == 15)
{ {
task.CLASS_DEPARTMENT_ID = null; task.CLASS_DEPARTMENT_ID = null;
task.SHOP_DEPARTMENT_ID = depart.ID; task.SHOP_DEPARTMENT_ID = depart.ID;
task.DEPT_DEPARTMENT_ID = depart.PARENT_ID; task.DEPT_DEPARTMENT_ID = depart.PARENT_ID;
} }
else if (depart.DEPARTMENT_TYPE == 0) else if (depart.DEPARTMENT_TYPE == 10)
{ {
task.CLASS_DEPARTMENT_ID = null; task.CLASS_DEPARTMENT_ID = null;
task.SHOP_DEPARTMENT_ID = null; task.SHOP_DEPARTMENT_ID = null;

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

@ -133,7 +133,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
foreach (var item in listDepAll) foreach (var item in listDepAll)
{ {
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (item.DEPARTMENT_TYPE == 0)//&& item.DEPARTMENT_STATUS == 1FMDepartmentStatus 职能部门 = 0, 生产部门 = 1, 安全部门 = 2, if (item.DEPARTMENT_TYPE == 10)//&& item.DEPARTMENT_STATUS == 1FMDepartmentStatus 职能部门 = 0, 生产部门 = 1, 安全部门 = 2,
{ {
listDep.Add(item); listDep.Add(item);
} }

4
APT.MicroApi/APT.PP.WebApi/Controllers/Api/BSController.cs
View File

@ -701,7 +701,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//有检查时间 就检查时间有排班 //有检查时间 就检查时间有排班
ChcekDateTime = Convert.ToDateTime(dtFirst.ToString("yyyy-MM-dd") + listPlanSetRund[i].CHECKTIME.Value.ToString(" HH:mm:ss")); ChcekDateTime = Convert.ToDateTime(dtFirst.ToString("yyyy-MM-dd") + listPlanSetRund[i].CHECKTIME.Value.ToString(" HH:mm:ss"));
expressionSC = expressionSC.And(e => e.DATE_TIME == dtFirst && e.START_TIME <= ChcekDateTime && e.END_TIME >= ChcekDateTime); expressionSC = expressionSC.And(e => e.DATE_TIME == dtFirst && e.START_TIME <= ChcekDateTime && e.END_TIME >= ChcekDateTime);
//e.Nav_DepartMent.DEPARTMENT_TYPE == 2 //e.Nav_DepartMent.DEPARTMENT_TYPE == 20
listTeamScheduling = this.GetOrderEntities<T_FM_DEPARTMENT_SCHEDULING>(expressionSC, null, pathScheduling).ToList(); listTeamScheduling = this.GetOrderEntities<T_FM_DEPARTMENT_SCHEDULING>(expressionSC, null, pathScheduling).ToList();
//listTeamScheduling = this.GetOrderEntities<T_FM_DEPARTMENT_SCHEDULING>(e => e.ENABLE_STATUS == 0 && e.DATE_TIME == dtFirst && e.START_TIME != e.END_TIME && e.START_TIME.Date == dtFirst.Date, null, pathScheduling).ToList(); //listTeamScheduling = this.GetOrderEntities<T_FM_DEPARTMENT_SCHEDULING>(e => e.ENABLE_STATUS == 0 && e.DATE_TIME == dtFirst && e.START_TIME != e.END_TIME && e.START_TIME.Date == dtFirst.Date, null, pathScheduling).ToList();
@ -1595,7 +1595,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
//FMTASKTYPE.BS_SafeCheck 班组 //FMTASKTYPE.BS_SafeCheck7 非班组 //FMTASKTYPE.BS_SafeCheck 班组 //FMTASKTYPE.BS_SafeCheck7 非班组
if (itemU.Nav_User.Nav_Department.DEPARTMENT_TYPE == 2) if (itemU.Nav_User.Nav_Department.DEPARTMENT_TYPE == 20)
{ {
dtTimeOut = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_SafeCheck, filter.OrgId.Value, dtNow, null, item.LIMITDATETIME); dtTimeOut = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_SafeCheck, filter.OrgId.Value, dtNow, null, item.LIMITDATETIME);
} }

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

@ -197,7 +197,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
foreach (var item in listDepSafe) foreach (var item in listDepSafe)
{ {
//部门=0, 车间=1, 班组=2, 公司=3 //部门=0, 车间=1, 班组=2, 公司=3
if (item.Nav_Department.DEPARTMENT_TYPE == 0) if (item.Nav_Department.DEPARTMENT_TYPE == 10)
{ {
if (item.DEPARTMENT_ID.HasValue && !listDepID.Contains(item.DEPARTMENT_ID.Value)) if (item.DEPARTMENT_ID.HasValue && !listDepID.Contains(item.DEPARTMENT_ID.Value))
{ {

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

@ -298,19 +298,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.END_TIME = monthEnd; completion.END_TIME = monthEnd;
if (departInfo != null) if (departInfo != null)
{ {
if (departInfo.DEPARTMENT_TYPE == 0) if (departInfo.DEPARTMENT_TYPE == 10)
{ {
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 (departInfo.DEPARTMENT_TYPE == 1) if (departInfoDEPARTMENT_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;
completion.SHOP_DEPARTMENT_ID = item.Key.TEAM_ID; completion.SHOP_DEPARTMENT_ID = item.Key.TEAM_ID;
completion.SHOP_DEPARTMENT_NAME = item.Key.TeamName; completion.SHOP_DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfo.DEPARTMENT_TYPE == 2) if (departInfo.DEPARTMENT_TYPE == 20)
{ {
completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME;
@ -358,19 +358,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.END_TIME = monthEnd; completion.END_TIME = monthEnd;
if (departInfo != null) if (departInfo != null)
{ {
if (departInfo.DEPARTMENT_TYPE == 0) if (departInfo.DEPARTMENT_TYPE == 10)
{ {
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 (departInfo.DEPARTMENT_TYPE == 1) if (departInfoDEPARTMENT_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;
completion.SHOP_DEPARTMENT_ID = item.Key.CLASS_TEAM_ID; completion.SHOP_DEPARTMENT_ID = item.Key.CLASS_TEAM_ID;
completion.SHOP_DEPARTMENT_NAME = item.Key.TeamName; completion.SHOP_DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfo.DEPARTMENT_TYPE == 2) if (departInfo.DEPARTMENT_TYPE == 20)
{ {
completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME;
@ -418,19 +418,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.END_TIME = monthEnd; completion.END_TIME = monthEnd;
if (departInfo != null) if (departInfo != null)
{ {
if (departInfo.DEPARTMENT_TYPE == 0) if (departInfo.DEPARTMENT_TYPE == 10)
{ {
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 (departInfo.DEPARTMENT_TYPE == 1) if (departInfoDEPARTMENT_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;
completion.SHOP_DEPARTMENT_ID = item.Key.TEAM_ID; completion.SHOP_DEPARTMENT_ID = item.Key.TEAM_ID;
completion.SHOP_DEPARTMENT_NAME = item.Key.TeamName; completion.SHOP_DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfo.DEPARTMENT_TYPE == 2) if (departInfo.DEPARTMENT_TYPE == 20)
{ {
completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME;
@ -932,19 +932,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.END_TIME = monthEnd; completion.END_TIME = monthEnd;
if (departInfo != null) if (departInfo != null)
{ {
if (departInfo.DEPARTMENT_TYPE == 0) if (departInfo.DEPARTMENT_TYPE == 10)
{ {
completion.DEPARTMENT_ID = item.departmetId; completion.DEPARTMENT_ID = item.departmetId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfo.DEPARTMENT_TYPE == 1) if (departInfoDEPARTMENT_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;
completion.SHOP_DEPARTMENT_ID = item.departmetId; completion.SHOP_DEPARTMENT_ID = item.departmetId;
completion.SHOP_DEPARTMENT_NAME = departInfo?.NAME; completion.SHOP_DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfo.DEPARTMENT_TYPE == 2) if (departInfo.DEPARTMENT_TYPE == 20)
{ {
completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME;
@ -1252,19 +1252,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.END_TIME = monthEnd; completion.END_TIME = monthEnd;
if (departInfo != null) if (departInfo != null)
{ {
if (departInfo.DEPARTMENT_TYPE == 0) if (departInfo.DEPARTMENT_TYPE == 10)
{ {
completion.DEPARTMENT_ID = item.departmentId; completion.DEPARTMENT_ID = item.departmentId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfo.DEPARTMENT_TYPE == 1) if (departInfoDEPARTMENT_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;
completion.SHOP_DEPARTMENT_ID = item.departmentId; completion.SHOP_DEPARTMENT_ID = item.departmentId;
completion.SHOP_DEPARTMENT_NAME = departInfo?.NAME; completion.SHOP_DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfo.DEPARTMENT_TYPE == 2) if (departInfo.DEPARTMENT_TYPE == 20)
{ {
completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME;
@ -1305,19 +1305,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.END_TIME = monthEnd; completion.END_TIME = monthEnd;
if (departInfo != null) if (departInfo != null)
{ {
if (departInfo.DEPARTMENT_TYPE == 0) if (departInfo.DEPARTMENT_TYPE == 10)
{ {
completion.DEPARTMENT_ID = item.departmentId; completion.DEPARTMENT_ID = item.departmentId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfo.DEPARTMENT_TYPE == 1) if (departInfoDEPARTMENT_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;
completion.SHOP_DEPARTMENT_ID = item.departmentId; completion.SHOP_DEPARTMENT_ID = item.departmentId;
completion.SHOP_DEPARTMENT_NAME = departInfo?.NAME; completion.SHOP_DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfo.DEPARTMENT_TYPE == 2) if (departInfo.DEPARTMENT_TYPE == 20)
{ {
completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.Nav_Parent?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.Nav_Parent?.NAME;
@ -1584,7 +1584,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//班组 //班组
depNum = 0; depNum = 0;
var depB = listDep.Where(e => e.DEPARTMENT_TYPE == 2).OrderBy(e => e.NUM); var depB = listDep.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM);
foreach (var itemD in depB) foreach (var itemD in depB)
{ {
depNum++; depNum++;
@ -1608,7 +1608,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; depNum = 0;
var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 1).OrderBy(e => e.NUM); var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
foreach (var itemD in depC) foreach (var itemD in depC)
{ {
depNum++; depNum++;
@ -1649,7 +1649,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//部门 //部门
depNum = 0; depNum = 0;
var depBM = listDep.Where(e => e.DEPARTMENT_TYPE == 0).OrderBy(e => e.NUM); var depBM = listDep.Where(e => e.DEPARTMENT_TYPE == 10).OrderBy(e => e.NUM);
foreach (var itemD in depBM) foreach (var itemD in depBM)
{ {
depNum++; depNum++;
@ -1690,7 +1690,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
depNum = 0; depNum = 0;
//公司 为了 格式 懒得改 统计所有 //公司 为了 格式 懒得改 统计所有
var depG = listDep.Where(e => e.DEPARTMENT_TYPE == 3 && !e.PARENT_ID.HasValue); var depG = listDep.Where(e => e.DEPARTMENT_TYPE == 5 && !e.PARENT_ID.HasValue);
foreach (var itemD in depG) foreach (var itemD in depG)
{ {
depNum++; depNum++;
@ -1855,7 +1855,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//班组 //班组
depNum = 0; depNum = 0;
var depB = listDep.Where(e => e.DEPARTMENT_TYPE == 2).OrderBy(e => e.NUM); var depB = listDep.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM);
foreach (var itemD in depB) foreach (var itemD in depB)
{ {
depNum++; depNum++;
@ -1928,7 +1928,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; depNum = 0;
var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 1).OrderBy(e => e.NUM); var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
foreach (var itemD in depC) foreach (var itemD in depC)
{ {
depNum++; depNum++;
@ -2037,7 +2037,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//部门 //部门
depNum = 0; depNum = 0;
var depBM = listDep.Where(e => e.DEPARTMENT_TYPE == 0).OrderBy(e => e.NUM); var depBM = listDep.Where(e => e.DEPARTMENT_TYPE == 10).OrderBy(e => e.NUM);
foreach (var itemD in depBM) foreach (var itemD in depBM)
{ {
depNum++; depNum++;
@ -2145,7 +2145,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//公司 为了 格式 懒得改 统计所有 //公司 为了 格式 懒得改 统计所有
depNum = 0; depNum = 0;
var depG = listDep.Where(e => e.DEPARTMENT_TYPE == 3 && !e.PARENT_ID.HasValue); var depG = listDep.Where(e => e.DEPARTMENT_TYPE == 5 && !e.PARENT_ID.HasValue);
foreach (var itemD in depG) foreach (var itemD in depG)
{ {
depNum++; depNum++;
@ -2448,7 +2448,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
depNum = 0; depNum = 0;
NUMS = 0; NUMS = 0;
Guid GUIDZY = new Guid("2897B8B6-FAC2-432B-8324-0208ADB893A8"); Guid GUIDZY = new Guid("2897B8B6-FAC2-432B-8324-0208ADB893A8");
var depB = listDep.Where(e => e.DEPARTMENT_TYPE == 2).OrderBy(e => e.NUM); var depB = listDep.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM);
foreach (var itemD in depB) foreach (var itemD in depB)
{ {
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 => e.DEPARTMENT_TYPE == 1).OrderBy(e => e.NUM); var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
foreach (var itemD in depC) foreach (var itemD in depC)
{ {
depNum++; depNum++;
@ -2544,7 +2544,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//部门 //部门
depNum = 0; depNum = 0;
NUMS = 0; NUMS = 0;
var depBM = listDep.Where(e => e.DEPARTMENT_TYPE == 0).OrderBy(e => e.NUM); var depBM = listDep.Where(e => e.DEPARTMENT_TYPE == 10).OrderBy(e => e.NUM);
foreach (var itemD in depBM) foreach (var itemD in depBM)
{ {
depNum++; depNum++;
@ -2602,7 +2602,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//公司 为了 格式 懒得改 统计所有 //公司 为了 格式 懒得改 统计所有
depNum = 0; depNum = 0;
NUMS = 0; NUMS = 0;
var depG = listDep.Where(e => e.DEPARTMENT_TYPE == 3 && !e.PARENT_ID.HasValue); var depG = listDep.Where(e => e.DEPARTMENT_TYPE == 5 && !e.PARENT_ID.HasValue);
foreach (var itemD in depG) foreach (var itemD in depG)
{ {
depNum++; depNum++;

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

@ -842,7 +842,7 @@ namespace APT.PP.WebApi.Controllers.Api
{ {
var alldepartIds = new List<Guid>(); var alldepartIds = new List<Guid>();
var allteamIds = new List<Guid>(); var allteamIds = new List<Guid>();
if (item!=null && item.Nav_Department!=null && item.Nav_Department.DEPARTMENT_TYPE == 3) if (item!=null && item.Nav_Department!=null && item.Nav_Department.DEPARTMENT_TYPE == 5)
{ {
alldepartIds.Add((Guid)item.DEPARTMENT_ID); alldepartIds.Add((Guid)item.DEPARTMENT_ID);
var dDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList(); var dDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList();
@ -852,7 +852,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_Department.DEPARTMENT_TYPE == 0) if (item != null && item.Nav_Department != null && item.Nav_Department.DEPARTMENT_TYPE == 10)
{ {
alldepartIds.Add((Guid)item.DEPARTMENT_ID); alldepartIds.Add((Guid)item.DEPARTMENT_ID);
var shopDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList(); var shopDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList();
@ -860,13 +860,13 @@ 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_Department.DEPARTMENT_TYPE == 1) if (item != null && item.Nav_Department != null && item.Nav_DepartmentDEPARTMENT_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();
alldepartIds.AddRange(classDepartIds); alldepartIds.AddRange(classDepartIds);
} }
if (item != null && item.Nav_Department != null && item.Nav_Department.DEPARTMENT_TYPE == 2) if (item != null && item.Nav_Department != null && item.Nav_Department.DEPARTMENT_TYPE == 20)
{ {
alldepartIds.Add((Guid)item.DEPARTMENT_ID); alldepartIds.Add((Guid)item.DEPARTMENT_ID);
} }

6
APT.MicroApi/APT.PP.WebApi/Controllers/Api/PTController.cs
View File

@ -466,8 +466,8 @@ namespace APT.PP.WebApi.Controllers.Api
var depart = departments.FirstOrDefault(t => t.NAME.Contains("安全环保") && t.DEPARTMENT_TYPE != 1 && t.DEPARTMENT_TYPE != 2); var depart = departments.FirstOrDefault(t => t.NAME.Contains("安全环保") && t.DEPARTMENT_TYPE != 1 && t.DEPARTMENT_TYPE != 2);
if (depart != null) if (depart != null)
{ {
var departList = departments.Where(t => t.DEPARTMENT_TYPE == 3 || t.DEPARTMENT_TYPE == 0).ToList(); var departList = departments.Where(t => t.DEPARTMENT_TYPE == 5 || t.DEPARTMENT_TYPE == 10).ToList();
var companyId = departList.FirstOrDefault(t => t.DEPARTMENT_TYPE == 3).ID; var companyId = departList.FirstOrDefault(t => t.DEPARTMENT_TYPE == 5).ID;
var userIds = departList.Where(t => t.DEPARTMENT_TYPE != 3).Select(m => m.USER_ID).ToList(); var userIds = departList.Where(t => t.DEPARTMENT_TYPE != 3).Select(m => m.USER_ID).ToList();
var userList = users.Where(t => userIds.Contains(t.ID) || t.DEPARTMENT_ID == companyId).ToList(); var userList = users.Where(t => userIds.Contains(t.ID) || t.DEPARTMENT_ID == companyId).ToList();
if (!departList.Any() && !userList.Any()) if (!departList.Any() && !userList.Any())
@ -482,7 +482,7 @@ namespace APT.PP.WebApi.Controllers.Api
} }
else if (set.DEPARTMENT_TYPE == FMDepartmentType.Class) else if (set.DEPARTMENT_TYPE == FMDepartmentType.Class)
{ {
var departList = departments.Where(t => t.DEPARTMENT_TYPE == 2).ToList(); var departList = departments.Where(t => t.DEPARTMENT_TYPE == 20).ToList();
if (departList.Any()) if (departList.Any())
{ {
foreach (var item in departList) foreach (var item in departList)

4
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SCController.cs
View File

@ -1160,7 +1160,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.DEPARTMENT_TYPE != 3 && listDepID.Contains(e.ID), null, null);//&&(e.DEPARTMENT_TYPE== FMDepartmentType.班组|| e.DEPARTMENT_TYPE == FMDepartmentType.车间|| e.DEPARTMENT_TYPE == FMDepartmentType.部门 var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.DEPARTMENT_TYPE != 3 && listDepID.Contains(e.ID), null, null);//&&(e.DEPARTMENT_TYPE== FMDepartmentType.班组|| e.DEPARTMENT_TYPE == FMDepartmentType.车间|| e.DEPARTMENT_TYPE == FMDepartmentType.部门
if (listDep != null && listDep.Any()) if (listDep != null && listDep.Any())
{ {
var listUserID = listDep.Where(e => e.USER_ID.HasValue && (e.DEPARTMENT_TYPE == 1 || e.DEPARTMENT_TYPE == 2 || (e.DEPARTMENT_TYPE == 0 && e.DEPARTMENT_STATUS != 0))).Select(e => e.USER_ID.Value).Distinct(); var listUserID = listDep.Where(e => e.USER_ID.HasValue && (e.DEPARTMENT_TYPE == 15 || e.DEPARTMENT_TYPE == 20 || (e.DEPARTMENT_TYPE == 10 && e.DEPARTMENT_STATUS != 0))).Select(e => e.USER_ID.Value).Distinct();
if (listUserID != null && listUserID.Any()) if (listUserID != null && listUserID.Any())
{ {
var users = GetEntities<T_FM_USER>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && listUserID.Contains(e.ID), null, null); var users = GetEntities<T_FM_USER>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && listUserID.Contains(e.ID), null, null);
@ -1360,7 +1360,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
listMTFA = listMT.Where(e => e.CREACTTYPE == CREACTTYPEEnum.ToOG060); listMTFA = listMT.Where(e => e.CREACTTYPE == CREACTTYPEEnum.ToOG060);
if (listMTFA != null && listMTFA.Any()) if (listMTFA != null && listMTFA.Any())
{ {
var deps = GetEntities<T_FM_DEPARTMENT>(e => e.ENABLE_STATUS == 0 && !e.IS_DELETED && e.DEPARTMENT_TYPE == 0 && e.DEPARTMENT_STATUS == (int)FMDepartmentStatus.生产部门, null, null); var deps = GetEntities<T_FM_DEPARTMENT>(e => e.ENABLE_STATUS == 0 && !e.IS_DELETED && e.DEPARTMENT_TYPE == 10 && e.DEPARTMENT_STATUS == (int)FMDepartmentStatus.生产部门, null, null);
if (deps != null && deps.Any()) if (deps != null && deps.Any())
{ {
var listDepID = deps.Select(e => e.ID); var listDepID = deps.Select(e => e.ID);

4
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
View File

@ -658,7 +658,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var hasDemandLaws = demandLaws.Where(t => t.Nav_DemandDistinguish.DISTINGUISH_TYPE == LRDistinguishEnum.已识别).OrderBy(t => t.Nav_DemandDistinguish.Nav_Department.DEPARTMENT_TYPE).ToList(); var hasDemandLaws = demandLaws.Where(t => t.Nav_DemandDistinguish.DISTINGUISH_TYPE == LRDistinguishEnum.已识别).OrderBy(t => t.Nav_DemandDistinguish.Nav_Department.DEPARTMENT_TYPE).ToList();
var hasDemandOthers = demandOthers.Where(t => t.Nav_DemandDistinguish.DISTINGUISH_TYPE == LRDistinguishEnum.已识别).OrderBy(t => t.Nav_DemandDistinguish.Nav_Department.DEPARTMENT_TYPE).ToList(); var hasDemandOthers = demandOthers.Where(t => t.Nav_DemandDistinguish.DISTINGUISH_TYPE == LRDistinguishEnum.已识别).OrderBy(t => t.Nav_DemandDistinguish.Nav_Department.DEPARTMENT_TYPE).ToList();
//公司级 //公司级
var company = allDepartMents.Where(l => l.DEPARTMENT_TYPE == 3).FirstOrDefault(); var company = allDepartMents.Where(l => l.DEPARTMENT_TYPE == 5).FirstOrDefault();
T_LR_DEMAND_DISTINGUISH_REPORT demandDistinguishReport = new T_LR_DEMAND_DISTINGUISH_REPORT(); T_LR_DEMAND_DISTINGUISH_REPORT demandDistinguishReport = new T_LR_DEMAND_DISTINGUISH_REPORT();
demandDistinguishReport.ID = Guid.NewGuid(); demandDistinguishReport.ID = Guid.NewGuid();
demandDistinguishReport.INVESTIGATE_TIMES = demandDistinguishs.Count(); demandDistinguishReport.INVESTIGATE_TIMES = demandDistinguishs.Count();
@ -746,7 +746,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
}); });
} }
//部门级 //部门级
var alldepartments = allDepartMents.Where(t => t.DEPARTMENT_TYPE == 0 && t.ID != AHDepartMent.DEPARTMENT_ID && t.IS_DELETED == false).ToList(); var alldepartments = allDepartMents.Where(t => t.DEPARTMENT_TYPE == 10 && t.ID != AHDepartMent.DEPARTMENT_ID && t.IS_DELETED == false).ToList();
foreach (var department in alldepartments) foreach (var department in alldepartments)
{ {
var deps = new List<Guid>(); var deps = new List<Guid>();

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

@ -247,7 +247,7 @@ namespace APT.PP.WebApi.Controllers.Api
} }
if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.班组级) if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.班组级)
{ {
departList = departs.Where(t => t.DEPARTMENT_TYPE == 20 && teamDepartIds.Contains(t.ID)).ToList(); departList = departs.Where(t => t.DEPARTMENT_TYPE == 200 && teamDepartIds.Contains(t.ID)).ToList();
} }
if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.公司级) if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.公司级)
{ {
@ -1248,7 +1248,7 @@ namespace APT.PP.WebApi.Controllers.Api
if (user != null) if (user != null)
{ {
//var userDepart = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID); //var userDepart = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID);
//if (userDepart.DEPARTMENT_TYPE == 2) //if (userDepart.DEPARTMENT_TYPE == 20)
//{ //{
// //if (teamDepartIds.Contains(user.DEPARTMENT_ID) && personIds.Contains((Guid)user.PERSON_ID)) // //if (teamDepartIds.Contains(user.DEPARTMENT_ID) && personIds.Contains((Guid)user.PERSON_ID))
// { // {
@ -1853,7 +1853,7 @@ namespace APT.PP.WebApi.Controllers.Api
if (shopClass.Any()) if (shopClass.Any())
{ {
var tempIds = shopClass.Select(t => t.ID).ToList(); 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 == 20).ToList(); var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 200).ToList();
if (tempIds.Any()) if (tempIds.Any())
{ {
//每个车间汇总班组和车间 //每个车间汇总班组和车间
@ -3217,7 +3217,7 @@ namespace APT.PP.WebApi.Controllers.Api
//else //else
//{ //{
// //岗位级默认班组 // //岗位级默认班组
// departTemps = departTemps.Where(t => t.DEPARTMENT_TYPE == 2); // departTemps = departTemps.Where(t => t.DEPARTMENT_TYPE == 20);
//} //}
//if (item.Nav_ListSetDepObject != null && item.Nav_ListSetDepObject.Any()) //if (item.Nav_ListSetDepObject != null && item.Nav_ListSetDepObject.Any())
//{ //{
@ -3254,13 +3254,13 @@ namespace APT.PP.WebApi.Controllers.Api
if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor) if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor)
{ {
//发给班长 //发给班长
var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 200 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
userIds.AddRange(userTempIds); userIds.AddRange(userTempIds);
} }
//if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post) //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post)
//{ //{
// //发给岗位工 // //发给岗位工
// var departIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 2).Select(t => t.ID).ToList(); // var departIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20).Select(t => t.ID).ToList();
// var userTempIds = users.Where(t => departIds.Contains((Guid)t.DEPARTMENT_ID)&& t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)).Select(m => m.ID).ToList(); // var userTempIds = users.Where(t => departIds.Contains((Guid)t.DEPARTMENT_ID)&& t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)).Select(m => m.ID).ToList();
// userIds.AddRange(userTempIds); // userIds.AddRange(userTempIds);
//} //}
@ -4779,7 +4779,7 @@ namespace APT.PP.WebApi.Controllers.Api
//else //else
//{ //{
// //岗位级默认班组 // //岗位级默认班组
// departTemps = departTemps.Where(t => t.DEPARTMENT_TYPE == 2); // departTemps = departTemps.Where(t => t.DEPARTMENT_TYPE == 20);
//} //}
//if (item.Nav_ListSetDepObject != null && item.Nav_ListSetDepObject.Any()) //if (item.Nav_ListSetDepObject != null && item.Nav_ListSetDepObject.Any())
//{ //{
@ -4816,13 +4816,13 @@ namespace APT.PP.WebApi.Controllers.Api
if (item.FirstOrDefault().PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor) if (item.FirstOrDefault().PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor)
{ {
//发给班长 //发给班长
var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 200 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
userIds.AddRange(userTempIds); userIds.AddRange(userTempIds);
} }
//if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post) //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post)
//{ //{
// //发给岗位工 // //发给岗位工
// var departIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 2).Select(t => t.ID).ToList(); // var departIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20).Select(t => t.ID).ToList();
// var userTempIds = users.Where(t => departIds.Contains((Guid)t.DEPARTMENT_ID)&& t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)).Select(m => m.ID).ToList(); // var userTempIds = users.Where(t => departIds.Contains((Guid)t.DEPARTMENT_ID)&& t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)).Select(m => m.ID).ToList();
// userIds.AddRange(userTempIds); // userIds.AddRange(userTempIds);
//} //}

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

@ -272,7 +272,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
var measure4 = GetEntities<T_HM_ENGINEERING_MEASURES>(t => t.IS_DELETED == false, measureFilter).Select(t => t.NAME).Distinct().Count(); var measure4 = GetEntities<T_HM_ENGINEERING_MEASURES>(t => t.IS_DELETED == false, measureFilter).Select(t => t.NAME).Distinct().Count();
var measure5 = GetEntities<T_HM_MANAGEMENT_MEASURES>(t => t.IS_DELETED == false, measureFilter).Select(t => t.NAME).Distinct().Count(); var measure5 = GetEntities<T_HM_MANAGEMENT_MEASURES>(t => t.IS_DELETED == false, measureFilter).Select(t => t.NAME).Distinct().Count();
//var distinctDepartment = allrisk.Select(t => new { t.SOURCE_DEPARTMENT_ID, t.Nav_SourceDepartment.NAME }).Distinct(); //var distinctDepartment = allrisk.Select(t => new { t.SOURCE_DEPARTMENT_ID, t.Nav_SourceDepartment.NAME }).Distinct();
var distinctDepartment = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == 0, new BaseFilter(filter.GetOrgId())); var distinctDepartment = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == 10, new BaseFilter(filter.GetOrgId()));
riskData riskData = new riskData(); riskData riskData = new riskData();
List<riskLevelCountModel> item1s = new List<riskLevelCountModel>(); List<riskLevelCountModel> item1s = new List<riskLevelCountModel>();
@ -440,9 +440,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
riskPerformanceData riskPerformanceData = new riskPerformanceData(); riskPerformanceData riskPerformanceData = new riskPerformanceData();
List<dateCountModel> item3s = new List<dateCountModel>(); List<dateCountModel> item3s = new List<dateCountModel>();
var distinctType = GetEntities<T_HM_RISK_TYPE>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); var distinctType = GetEntities<T_HM_RISK_TYPE>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId()));
var distinctDepartment = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == 0, new BaseFilter(filter.GetOrgId())); var distinctDepartment = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == 10, new BaseFilter(filter.GetOrgId()));
var distinctArea = GetEntities<T_HM_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); var distinctArea = GetEntities<T_HM_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId()));
var distinctTeamDepartment = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == 2, new BaseFilter(filter.GetOrgId())); var distinctTeamDepartment = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == 20, new BaseFilter(filter.GetOrgId()));
#region 1 #region 1
PerformanceModel CHARTFXDJ1 = new PerformanceModel(); PerformanceModel CHARTFXDJ1 = new PerformanceModel();

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

@ -50,7 +50,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
} }
var depLogin = GetEntity<T_FM_DEPARTMENT>(APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value); var depLogin = GetEntity<T_FM_DEPARTMENT>(APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value);
////FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 ////FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
//if (depLogin.DEPARTMENT_TYPE == 2) //if (depLogin.DEPARTMENT_TYPE == 20)
//{ //{
// //班组级 因数据少不好看 显示车间信息（功能需求变更） // //班组级 因数据少不好看 显示车间信息（功能需求变更）
// listDep = GetEntities<T_FM_DEPARTMENT>(e => e.PARENT_ID.HasValue && e.PARENT_ID.Value == depLogin.PARENT_ID, null, null).ToList(); // listDep = GetEntities<T_FM_DEPARTMENT>(e => e.PARENT_ID.HasValue && e.PARENT_ID.Value == depLogin.PARENT_ID, null, null).ToList();
@ -60,7 +60,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
// listDep = GetEntities<T_FM_DEPARTMENT>(e => e.PARENT_ID.HasValue && e.PARENT_ID.Value == depID, null, null).ToList(); // listDep = GetEntities<T_FM_DEPARTMENT>(e => e.PARENT_ID.HasValue && e.PARENT_ID.Value == depID, null, null).ToList();
//} //}
if (depLogin.DEPARTMENT_TYPE == 2) if (depLogin.DEPARTMENT_TYPE == 20)
{ {
//班组级 因数据少不好看 显示车间信息（功能需求变更） //班组级 因数据少不好看 显示车间信息（功能需求变更）
listDep = GetEntities<T_FM_DEPARTMENT>(e => e.ID == depLogin.PARENT_ID.Value, null, null).ToList(); listDep = GetEntities<T_FM_DEPARTMENT>(e => e.ID == depLogin.PARENT_ID.Value, null, null).ToList();
@ -69,7 +69,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{ {
if (depLogin.DEPARTMENT_STATUS == 2)//安环 看公司级 if (depLogin.DEPARTMENT_STATUS == 2)//安环 看公司级
{ {
listDep.Add(GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 3 && !e.IS_DELETED)); listDep.Add(GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 5 && !e.IS_DELETED));
} }
else else
{ {
@ -163,7 +163,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//{ //{
// //公司级 // //公司级
// //listLoginDep = listDep; // //listLoginDep = listDep;
// listLoginDep = GetEntities<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 3 && !e.IS_DELETED && e.ENABLE_STATUS == 0, null, null).ToList(); // listLoginDep = GetEntities<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 5 && !e.IS_DELETED && e.ENABLE_STATUS == 0, null, null).ToList();
//} //}
//List<T_BI_HOME_BSRISKREASON> listCorrectT = BIHomeService.GetHomeCorrect(filter.OrgId, listLoginDep).ToList(); //List<T_BI_HOME_BSRISKREASON> listCorrectT = BIHomeService.GetHomeCorrect(filter.OrgId, listLoginDep).ToList();
@ -173,7 +173,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//公司/部门/车间 显示本组织 的数据 //公司/部门/车间 显示本组织 的数据
//班组 显示 车间的数据 //班组 显示 车间的数据
//List<T_FM_DEPARTMENT> listDepC = new List<T_FM_DEPARTMENT>(); //List<T_FM_DEPARTMENT> listDepC = new List<T_FM_DEPARTMENT>();
//if (depLogin.DEPARTMENT_TYPE == 2) //if (depLogin.DEPARTMENT_TYPE == 20)
//{ //{
// //depLogin // //depLogin
// listDepC.Add(GetEntity<T_FM_DEPARTMENT>(e => e.ID == depLogin.PARENT_ID.Value)); // listDepC.Add(GetEntity<T_FM_DEPARTMENT>(e => e.ID == depLogin.PARENT_ID.Value));
@ -182,7 +182,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//{ //{
// if (depLogin.DEPARTMENT_STATUS == 2)//安环 看公司级 // if (depLogin.DEPARTMENT_STATUS == 2)//安环 看公司级
// { // {
// listDepC.Add(GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 3 && !e.IS_DELETED)); // listDepC.Add(GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 5 && !e.IS_DELETED));
// } // }
// else // else
// { // {
@ -428,7 +428,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
BaseFilter filterD = new BaseFilter(); BaseFilter filterD = new BaseFilter();
filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" }; filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 0, filterD, null);//部门就可以了 因为都相向 统计了 var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, filterD, null);//部门就可以了 因为都相向 统计了
if (listDep1MineType != null && listDep1MineType.Any()) if (listDep1MineType != null && listDep1MineType.Any())
{ {
List<HomeSafeCheckCountMonth> ListSafeCheckYearMonth = new List<HomeSafeCheckCountMonth>(); List<HomeSafeCheckCountMonth> ListSafeCheckYearMonth = new List<HomeSafeCheckCountMonth>();
@ -605,9 +605,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//BaseFilter filterD = new BaseFilter(); //BaseFilter filterD = new BaseFilter();
//filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID", "MineType" }; //filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID", "MineType" };
//var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 0, filterD, null);//部门就可以了 因为都相向 统计了 //var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, filterD, null);//部门就可以了 因为都相向 统计了
var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 0, null, null);//部门就可以了 因为都相向 统计了 var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, null, null);//部门就可以了 因为都相向 统计了
#endregion #endregion
@ -1158,7 +1158,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//BaseFilter filterD = new BaseFilter(); //BaseFilter filterD = new BaseFilter();
//filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" }; //filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
//var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 0, filterD, null);//部门就可以了 因为都相向 统计了 //var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, filterD, null);//部门就可以了 因为都相向 统计了
if (listDep != null && listDep.Any()) if (listDep != null && listDep.Any())
{ {
List<HomeSafeCheckCountMonth> ListSafeCheckYearMonth = new List<HomeSafeCheckCountMonth>(); List<HomeSafeCheckCountMonth> ListSafeCheckYearMonth = new List<HomeSafeCheckCountMonth>();
@ -1311,20 +1311,20 @@ namespace APT.SC.WebApi.Controllers.Api.BI
filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" }; filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && (t.DEPARTMENT_TYPE == 1 || t.DEPARTMENT_TYPE == 2), filterD, null); var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null);
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (listDep1MineType == null || !listDep1MineType.Any()) if (listDep1MineType == null || !listDep1MineType.Any())
{ {
return result; return result;
} }
List<Guid> listDepIDCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 1).Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量 List<Guid> listDepIDCJ = listDep1MineType.Where(e => eDEPARTMENT_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 => e.DEPARTMENT_TYPE == 1).OrderBy(e => e.NUM).ToList(); listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 2).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;
#region 月度 12 个月 安全检查、检查类型 数量 #region 月度 12 个月 安全检查、检查类型 数量
@ -1341,11 +1341,11 @@ namespace APT.SC.WebApi.Controllers.Api.BI
var listDepID = GetEntities<T_FM_DEPARTMENT_PRODUCTION_UNIT>(e => e.ENUMS_ID == enums.ID, null, null).Select(e => e.DEPARTMENT_ID); var listDepID = GetEntities<T_FM_DEPARTMENT_PRODUCTION_UNIT>(e => e.ENUMS_ID == enums.ID, null, null).Select(e => e.DEPARTMENT_ID);
if (listDepID != null && listDepID.Any()) if (listDepID != null && listDepID.Any())
{ {
listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 1 || t.DEPARTMENT_TYPE == 2), 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 => e.DEPARTMENT_TYPE == 1).ToList(); listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 2).ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).ToList();
} }
} }
} }
@ -1552,9 +1552,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" }; filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
///部门 ///部门
//var listDep1MineTypeSum = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 0, filterD, null); //var listDep1MineTypeSum = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, filterD, null);
///车间 班组 ///车间 班组
var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && (t.DEPARTMENT_TYPE == 1 || t.DEPARTMENT_TYPE == 2 || t.DEPARTMENT_TYPE == 0), filterD, null); var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20 || t.DEPARTMENT_TYPE == 10), filterD, null);
//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 //FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (listDep1MineType == null || !listDep1MineType.Any()) if (listDep1MineType == null || !listDep1MineType.Any())
@ -1566,8 +1566,8 @@ 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 => e.DEPARTMENT_TYPE == 1).OrderBy(e => e.NUM).ToList(); listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 2).OrderBy(e => e.NUM).ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();
#region //月度 隐患整改情况 #region //月度 隐患整改情况
@ -1598,7 +1598,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
#region 新版 有组织合并 #region 新版 有组织合并
var listDepID = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 0).Select(e => e.ID); var listDepID = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 10).Select(e => e.ID);
var depID = listCorrectT.FirstOrDefault(e => listDepID.Contains(e.DEPARTMENT_ID))?.DEPARTMENT_ID; var depID = listCorrectT.FirstOrDefault(e => listDepID.Contains(e.DEPARTMENT_ID))?.DEPARTMENT_ID;
if (depID == null) if (depID == null)
@ -1617,7 +1617,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//处理此信息 //处理此信息
var Temp = listCorrectT.Where(e => e.YEAR == listCorrectT[i].YEAR && e.MONTH == listCorrectT[i].MONTH && e.SOURCEVAL == listCorrectT[i].SOURCEVAL && listDepID.Contains(e.DEPARTMENT_ID)); var Temp = listCorrectT.Where(e => e.YEAR == listCorrectT[i].YEAR && e.MONTH == listCorrectT[i].MONTH && e.SOURCEVAL == listCorrectT[i].SOURCEVAL && listDepID.Contains(e.DEPARTMENT_ID));
//var listDepID = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 0).Select(e => e.ID);//部门ID //var listDepID = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 10).Select(e => e.ID);//部门ID
//result.ListC = listC.Where(e => listDepID.Contains(e.DEPARTMENT_ID)).ToList(); //result.ListC = listC.Where(e => listDepID.Contains(e.DEPARTMENT_ID)).ToList();
if (i == 0 || listCorrectT[i].SOURCEVAL != listCorrectT[i - 1].SOURCEVAL) if (i == 0 || listCorrectT[i].SOURCEVAL != listCorrectT[i - 1].SOURCEVAL)
@ -1993,7 +1993,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
#endregion #endregion
//var listDepID = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 0).Select(e => e.ID);//部门ID //var listDepID = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 10).Select(e => e.ID);//部门ID
//result.ListC = listC.Where(e => listDepID.Contains(e.DEPARTMENT_ID)).ToList(); //result.ListC = listC.Where(e => listDepID.Contains(e.DEPARTMENT_ID)).ToList();
#endregion #endregion

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

@ -369,7 +369,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_Parent"); var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_Parent");
if (tasks.Any()) if (tasks.Any())
{ {
var company = departments.FirstOrDefault(t => t.DEPARTMENT_TYPE == 3); var company = departments.FirstOrDefault(t => t.DEPARTMENT_TYPE == 5);
foreach (var item in tasks) foreach (var item in tasks)
{ {
var user = users.FirstOrDefault(t => t.ID == item.USER_ID); var user = users.FirstOrDefault(t => t.ID == item.USER_ID);
@ -408,7 +408,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
} }
tasks = tasks.Where(t => t.DEPARTMENT_ID != null).ToList(); tasks = tasks.Where(t => t.DEPARTMENT_ID != null).ToList();
tasks.ForEach(m => { m.DEPARTMENT_NAME = company?.NAME; }); tasks.ForEach(m => { m.DEPARTMENT_NAME = company?.NAME; });
var departs = departments.Where(t => t.DEPARTMENT_TYPE == 2).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(m => m.NUM).ToList(); var departs = departments.Where(t => t.DEPARTMENT_TYPE == 20).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(m => m.NUM).ToList();
if (!string.IsNullOrEmpty(filter.Keyword)) if (!string.IsNullOrEmpty(filter.Keyword))
{ {
var type = filter.Keyword.ToString(); var type = filter.Keyword.ToString();
@ -417,20 +417,20 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
case "0": case "0":
tasks = tasks.Where(t => t.DEPT_DEPARTMENT_ID != null).ToList(); tasks = tasks.Where(t => t.DEPT_DEPARTMENT_ID != null).ToList();
tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.DEPT_DEPARTMENT_ID)?.NAME; }); tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.DEPT_DEPARTMENT_ID)?.NAME; });
departs = departments.Where(t => t.DEPARTMENT_TYPE == 0).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList(); departs = departments.Where(t => t.DEPARTMENT_TYPE == 10).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList();
break; break;
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 => t.DEPARTMENT_TYPE == 1).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList(); departs = departments.Where(t => tDEPARTMENT_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();
tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.CLASS_DEPARTMENT_ID)?.NAME; }); tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.CLASS_DEPARTMENT_ID)?.NAME; });
departs = departments.Where(t => t.DEPARTMENT_TYPE == 2).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList(); departs = departments.Where(t => t.DEPARTMENT_TYPE == 20).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList();
break; break;
case "3": case "3":
departs = departments.Where(t => t.DEPARTMENT_TYPE == 3).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList(); departs = departments.Where(t => t.DEPARTMENT_TYPE == 5).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList();
break; break;
default: default:
break; break;
@ -10355,7 +10355,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
completionSorts.Add(info); completionSorts.Add(info);
} }
} }
List<DepartmentInfos> completionSorts1 = completionSorts.Where(t => t.DEPARTMENT_TYPE == 3).ToList(); List<DepartmentInfos> completionSorts1 = completionSorts.Where(t => t.DEPARTMENT_TYPE == 5).ToList();
var temps = completionSorts.Where(t => t.DEPARTMENT_TYPE != 3).OrderBy(m => m.DEPARTMENT_TYPE).ToList(); var temps = completionSorts.Where(t => t.DEPARTMENT_TYPE != 3).OrderBy(m => m.DEPARTMENT_TYPE).ToList();
completionSorts1.AddRange(temps); completionSorts1.AddRange(temps);
ret.retData = completionSorts1; ret.retData = completionSorts1;
@ -10409,7 +10409,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
approveUsers.Add(info); approveUsers.Add(info);
} }
} }
List<ApproveUserInfos> approveUsers1 = approveUsers.Where(t => t.DEPARTMENT_TYPE == 3).ToList(); List<ApproveUserInfos> approveUsers1 = approveUsers.Where(t => t.DEPARTMENT_TYPE == 5).ToList();
var tempApproves = approveUsers.Where(t => t.DEPARTMENT_TYPE != 3).OrderBy(m => m.DEPARTMENT_TYPE).ToList(); var tempApproves = approveUsers.Where(t => t.DEPARTMENT_TYPE != 3).OrderBy(m => m.DEPARTMENT_TYPE).ToList();
approveUsers1.AddRange(tempApproves); approveUsers1.AddRange(tempApproves);
ret.retDataApprove = approveUsers1; ret.retDataApprove = approveUsers1;
@ -10517,7 +10517,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
List<T_BI_MOULD_RUN_SUMMARY> mouldSummary = new List<T_BI_MOULD_RUN_SUMMARY>(); List<T_BI_MOULD_RUN_SUMMARY> mouldSummary = new List<T_BI_MOULD_RUN_SUMMARY>();
newFilter.SelectField = new List<string> { "ID", "PARENT_ID", "NAME", "Nav_Parent", "DEPARTMENT_TYPE" }; newFilter.SelectField = new List<string> { "ID", "PARENT_ID", "NAME", "Nav_Parent", "DEPARTMENT_TYPE" };
var departmentInfos = this.GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED && t.ENABLE_STATUS == 0, newFilter).ToList(); var departmentInfos = this.GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED && t.ENABLE_STATUS == 0, newFilter).ToList();
var companyIds = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 3).Select(m => m.ID).ToList(); var companyIds = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 5).Select(m => m.ID).ToList();
//按部门 //按部门
var departGroupYear = result.Where(t => t.DEPT_DEPARTMENT_ID != null && !companyIds.Contains((Guid)t.DEPT_DEPARTMENT_ID)).ToList(); var departGroupYear = result.Where(t => t.DEPT_DEPARTMENT_ID != null && !companyIds.Contains((Guid)t.DEPT_DEPARTMENT_ID)).ToList();
//分组 //分组
@ -10669,15 +10669,15 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
if (departInfo != null && departInfo.IS_DELETED == false) if (departInfo != null && departInfo.IS_DELETED == false)
{ {
//部门 //部门
if (departInfo.DEPARTMENT_TYPE == 0) if (departInfo.DEPARTMENT_TYPE == 10)
{ {
express = express.And(t => t.DEPT_DEPARTMENT_ID == departInfo.ID); express = express.And(t => t.DEPT_DEPARTMENT_ID == departInfo.ID);
} }
else if (departInfo.DEPARTMENT_TYPE == 1) else if (departInfoDEPARTMENT_TYPE == 15)
{ {
express = express.And(t => t.SHOP_DEPARTMENT_ID == departInfo.ID); express = express.And(t => t.SHOP_DEPARTMENT_ID == departInfo.ID);
} }
else if (departInfo.DEPARTMENT_TYPE == 2) else if (departInfo.DEPARTMENT_TYPE == 20)
{ {
express = express.And(t => t.CLASS_DEPARTMENT_ID == departInfo.ID); express = express.And(t => t.CLASS_DEPARTMENT_ID == departInfo.ID);
} }
@ -10789,7 +10789,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
DepartmentInfo ret = new DepartmentInfo(); DepartmentInfo ret = new DepartmentInfo();
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value; var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
var departInfos = this.GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED, new BaseFilter(orgId)); var departInfos = this.GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED, new BaseFilter(orgId));
var company = departInfos.FirstOrDefault(t => t.DEPARTMENT_TYPE == 3); var company = departInfos.FirstOrDefault(t => t.DEPARTMENT_TYPE == 5);
if (company != null) if (company != null)
{ {
//公司 //公司

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/H5Controller.cs
View File

@ -462,7 +462,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{ {
return SafeGetPagedData(delegate (PagedActionResult<T_FM_DEPARTMENT> result) return SafeGetPagedData(delegate (PagedActionResult<T_FM_DEPARTMENT> result)
{ {
PagedActionResult<T_FM_DEPARTMENT> orderPageEntities = GetOrderPageEntities<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 2 && e.ENABLE_STATUS == 0 && !e.IS_DELETED, pageFilter, null); PagedActionResult<T_FM_DEPARTMENT> orderPageEntities = GetOrderPageEntities<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == 20 && e.ENABLE_STATUS == 0 && !e.IS_DELETED, pageFilter, null);
result.Data = orderPageEntities.Data; result.Data = orderPageEntities.Data;
result.TotalCount = orderPageEntities.TotalCount; result.TotalCount = orderPageEntities.TotalCount;
}); });

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/CMController/CMDrillPlanController.cs
View File

@ -196,7 +196,7 @@ namespace APT.SC.WebApi.Controllers.Api.CM
Guid depID = Guid.Empty; Guid depID = Guid.Empty;
Expression<Func<T_CM_DRILL_PLAN_DETAIL, bool>> expression = e => e.TRIGGER_TIME != null && e.TRIGGER_TIME.Value.Year == Time.Year && !e.IS_DELETED && e.Nav_PLAN.YEAR == Time.Year && e.Nav_PLAN.STATUS == PFStandardStatus.Archived; Expression<Func<T_CM_DRILL_PLAN_DETAIL, bool>> expression = e => e.TRIGGER_TIME != null && e.TRIGGER_TIME.Value.Year == Time.Year && !e.IS_DELETED && e.Nav_PLAN.YEAR == Time.Year && e.Nav_PLAN.STATUS == PFStandardStatus.Archived;
var userLogin = GetEntity<T_FM_USER>(e => e.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID, "Nav_Department"); var userLogin = GetEntity<T_FM_USER>(e => e.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID, "Nav_Department");
if (userLogin.Nav_Department.DEPARTMENT_TYPE == 0) if (userLogin.Nav_Department.DEPARTMENT_TYPE == 10)
{ {
if (userLogin.Nav_Department.DEPARTMENT_STATUS != 2) if (userLogin.Nav_Department.DEPARTMENT_STATUS != 2)
depID = userLogin.DEPARTMENT_ID.Value; depID = userLogin.DEPARTMENT_ID.Value;

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/DMController/DeviceRepairController.cs
View File

@ -106,7 +106,7 @@ namespace APT.SC.WebApi.Controllers.Api.DM
IS_HELP = entity.IS_HELP, IS_HELP = entity.IS_HELP,
}; };
//var userInfo = this.GetEntity<T_FM_USER>(t => t.ID == entity.REPAIR_USER_ID, "Nav_Department"); //var userInfo = this.GetEntity<T_FM_USER>(t => t.ID == entity.REPAIR_USER_ID, "Nav_Department");
//if (userInfo.Nav_Department !=null && (userInfo.Nav_Department.DEPARTMENT_TYPE == 0 || userInfo.Nav_Department.DEPARTMENT_TYPE == 3)) //if (userInfo.Nav_Department !=null && (userInfo.Nav_Department.DEPARTMENT_TYPE == 10 || userInfo.Nav_Department.DEPARTMENT_TYPE == 5))
//{ //{
// throw new Exception("维修人员不能是车间级别以上"); // throw new Exception("维修人员不能是车间级别以上");
//} //}

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs
View File

@ -126,11 +126,11 @@ namespace APT.LR.WebApi.Controllers.Api
if (depart != null) if (depart != null)
{ {
var param = "安全员"; var param = "安全员";
if (depart.DEPARTMENT_TYPE == 3) if (depart.DEPARTMENT_TYPE == 5)
{ {
param = "安环部安全员"; param = "安环部安全员";
} }
if (depart.DEPARTMENT_TYPE == 2) if (depart.DEPARTMENT_TYPE == 20)
{ {
param = "负责人"; param = "负责人";
} }

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
View File

@ -84,7 +84,7 @@ namespace APT.SC.WebApi.Controllers.Api.SC
{ {
//部门级负责人 安全员 //部门级负责人 安全员
//FMDepartmentType.部门 =0 //FMDepartmentType.部门 =0
var listDep0 = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_TYPE == 0, null, null); var listDep0 = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_TYPE == 10, null, null);
var listApprovreRole = GetEntities<T_PF_APPROVAL_ROLE>(e => !e.IS_DELETED && (e.NAME == "部门负责人" || e.NAME == "部门安全员" || e.NAME == "安环部负责人" || e.NAME == "安环部安全员"), null, null); var listApprovreRole = GetEntities<T_PF_APPROVAL_ROLE>(e => !e.IS_DELETED && (e.NAME == "部门负责人" || e.NAME == "部门安全员" || e.NAME == "安环部负责人" || e.NAME == "安环部安全员"), null, null);
if (listDep0 != null && listDep0.Any() && listApprovreRole != null && listApprovreRole.Any()) if (listDep0 != null && listDep0.Any() && listApprovreRole != null && listApprovreRole.Any())
{ {
@ -1738,7 +1738,7 @@ namespace APT.SC.WebApi.Controllers.Api.SC
{ {
//部门级负责人 安全员 //部门级负责人 安全员
//FMDepartmentType.部门 =0 //FMDepartmentType.部门 =0
var listDep0 = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_TYPE == 0, null, null); var listDep0 = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_TYPE == 10, null, null);
var listApprovreRole = GetEntities<T_PF_APPROVAL_ROLE>(e => !e.IS_DELETED && (e.NAME == "部门负责人" || e.NAME == "部门安全员" || e.NAME == "安环部负责人" || e.NAME == "安环部安全员"), null, null); var listApprovreRole = GetEntities<T_PF_APPROVAL_ROLE>(e => !e.IS_DELETED && (e.NAME == "部门负责人" || e.NAME == "部门安全员" || e.NAME == "安环部负责人" || e.NAME == "安环部安全员"), null, null);
if (listDep0 != null && listDep0.Any() && listApprovreRole != null && listApprovreRole.Any()) if (listDep0 != null && listDep0.Any() && listApprovreRole != null && listApprovreRole.Any())

8
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OHController/OHHealthExamNoticeController.cs
View File

@ -527,12 +527,12 @@ namespace APT.SC.WebApi.Controllers.Api.OH
DEPARTMENT_ID = User.DEPARTMENT_ID.Value; DEPARTMENT_ID = User.DEPARTMENT_ID.Value;
Department = User.Nav_Department; Department = User.Nav_Department;
//if (User.Nav_Department.DEPARTMENT_TYPE == 3) //if (User.Nav_Department.DEPARTMENT_TYPE == 5)
//{ //{
// DEPARTMENT_ID = User.DEPARTMENT_ID.Value; // DEPARTMENT_ID = User.DEPARTMENT_ID.Value;
// Department = User.Nav_Department; // Department = User.Nav_Department;
//} //}
//else if (User.Nav_Department.DEPARTMENT_TYPE == 2) //else if (User.Nav_Department.DEPARTMENT_TYPE == 20)
//{ //{
// DEPARTMENT_ID_WORKSHOP = User.Nav_Department.PARENT_ID.Value; // DEPARTMENT_ID_WORKSHOP = User.Nav_Department.PARENT_ID.Value;
// DepartmentWorkshop = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID_WORKSHOP.Value, "Nav_Parent"); // DepartmentWorkshop = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID_WORKSHOP.Value, "Nav_Parent");
@ -541,7 +541,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
// Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value); // Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value);
//} //}
//else if (User.Nav_Department.DEPARTMENT_TYPE == 1) //else if (User.Nav_DepartmentDEPARTMENT_TYPE == 15)
//{ //{
// DEPARTMENT_ID_WORKSHOP = User.DEPARTMENT_ID.Value; // DEPARTMENT_ID_WORKSHOP = User.DEPARTMENT_ID.Value;
// DEPARTMENT_ID = User.Nav_Department.PARENT_ID.Value; // DEPARTMENT_ID = User.Nav_Department.PARENT_ID.Value;
@ -549,7 +549,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
// DepartmentWorkshop = User.Nav_Department; // DepartmentWorkshop = User.Nav_Department;
// Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value); // Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value);
//} //}
//else if (User.Nav_Department.DEPARTMENT_TYPE == 0) //else if (User.Nav_Department.DEPARTMENT_TYPE == 10)
//{ //{
// DEPARTMENT_ID = User.DEPARTMENT_ID.Value; // DEPARTMENT_ID = User.DEPARTMENT_ID.Value;
// Department = User.Nav_Department; // Department = User.Nav_Department;

16
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OHController/OHHealthExamPlanController.cs
View File

@ -110,7 +110,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
//提交后发送上报部门安全员填写体检员工登记表，职能部门发送给部门负责人，综合部人员中包含公司领导 //提交后发送上报部门安全员填写体检员工登记表，职能部门发送给部门负责人，综合部人员中包含公司领导
//[ "部门类型")] DEPARTMENT_STATUS { get; set; } 职能部门 = 0, 生产部门 = 1, 安全部门 = 2, //[ "部门类型")] DEPARTMENT_STATUS { get; set; } 职能部门 = 0, 生产部门 = 1, 安全部门 = 2,
var listDepIDNotice = ListDepartment.Select(e => e.DEPARTMENT_ID); var listDepIDNotice = ListDepartment.Select(e => e.DEPARTMENT_ID);
var listDep = GetEntities<T_FM_DEPARTMENT>(e => listDepIDNotice.Contains(e.ID) && e.DEPARTMENT_TYPE == 0 && !e.IS_DELETED && e.ENABLE_STATUS == 0, null, new string[] { "Nav_User" });//部门级别 var listDep = GetEntities<T_FM_DEPARTMENT>(e => listDepIDNotice.Contains(e.ID) && e.DEPARTMENT_TYPE == 10 && !e.IS_DELETED && e.ENABLE_STATUS == 0, null, new string[] { "Nav_User" });//部门级别
if (listDep == null || !listDep.Any()) if (listDep == null || !listDep.Any())
{ {
throw new Exception("获取部门信息失败！"); throw new Exception("获取部门信息失败！");
@ -279,12 +279,12 @@ namespace APT.SC.WebApi.Controllers.Api.OH
//部门=0, 车间=1, 班组=2, 公司=3 //部门=0, 车间=1, 班组=2, 公司=3
#region 获取部门信息 #region 获取部门信息
//if (User.Nav_Department.DEPARTMENT_TYPE == 3) //if (User.Nav_Department.DEPARTMENT_TYPE == 5)
//{ //{
// DEPARTMENT_ID = User.DEPARTMENT_ID.Value; // DEPARTMENT_ID = User.DEPARTMENT_ID.Value;
// Department = User.Nav_Department; // Department = User.Nav_Department;
//} //}
//else if (User.Nav_Department.DEPARTMENT_TYPE == 2) //else if (User.Nav_Department.DEPARTMENT_TYPE == 20)
//{ //{
// DEPARTMENT_ID_WORKSHOP = User.Nav_Department.PARENT_ID.Value; // DEPARTMENT_ID_WORKSHOP = User.Nav_Department.PARENT_ID.Value;
// DepartmentWorkshop = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID_WORKSHOP.Value, "Nav_Parent"); // DepartmentWorkshop = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID_WORKSHOP.Value, "Nav_Parent");
@ -293,7 +293,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
// Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value); // Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value);
//} //}
//else if (User.Nav_Department.DEPARTMENT_TYPE == 1) //else if (User.Nav_DepartmentDEPARTMENT_TYPE == 15)
//{ //{
// DEPARTMENT_ID_WORKSHOP = User.DEPARTMENT_ID.Value; // DEPARTMENT_ID_WORKSHOP = User.DEPARTMENT_ID.Value;
// DEPARTMENT_ID = User.Nav_Department.PARENT_ID.Value; // DEPARTMENT_ID = User.Nav_Department.PARENT_ID.Value;
@ -301,7 +301,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
// DepartmentWorkshop = User.Nav_Department; // DepartmentWorkshop = User.Nav_Department;
// Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value); // Department = GetEntity<T_FM_DEPARTMENT>(DEPARTMENT_ID.Value);
//} //}
//else if (User.Nav_Department.DEPARTMENT_TYPE == 0) //else if (User.Nav_Department.DEPARTMENT_TYPE == 10)
//{ //{
// DEPARTMENT_ID = User.DEPARTMENT_ID.Value; // DEPARTMENT_ID = User.DEPARTMENT_ID.Value;
// Department = User.Nav_Department; // Department = User.Nav_Department;
@ -514,7 +514,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
List<T_FM_USER> listUser = new List<T_FM_USER>(); List<T_FM_USER> listUser = new List<T_FM_USER>();
if (PlanDep.ISCONTENTMASTER) if (PlanDep.ISCONTENTMASTER)
{ {
var listrUserCom = GetEntities<T_FM_USER>(e => e.ENABLE_STATUS == 0 && !e.IS_DELETED && e.CODE != "admin" && e.DEPARTMENT_ID.HasValue && e.Nav_Department.DEPARTMENT_TYPE == 3 && e.PERSON_ID.HasValue && e.Nav_Person.POST_ID.HasValue, null, new string[] { "Nav_Person.Nav_Post", "Nav_Department" }).OrderByDescending(e => e.APPROVE_ROLE_ID);//&& listPostID.Contains(e.Nav_Person.POST_ID.Value) var listrUserCom = GetEntities<T_FM_USER>(e => e.ENABLE_STATUS == 0 && !e.IS_DELETED && e.CODE != "admin" && e.DEPARTMENT_ID.HasValue && e.Nav_Department.DEPARTMENT_TYPE == 5 && e.PERSON_ID.HasValue && e.Nav_Person.POST_ID.HasValue, null, new string[] { "Nav_Person.Nav_Post", "Nav_Department" }).OrderByDescending(e => e.APPROVE_ROLE_ID);//&& listPostID.Contains(e.Nav_Person.POST_ID.Value)
if (listrUserCom != null && listrUserCom.Any()) if (listrUserCom != null && listrUserCom.Any())
{ {
listUser.AddRange(listrUserCom); listUser.AddRange(listrUserCom);
@ -571,7 +571,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
//获取 部门 车间 //获取 部门 车间
#region 获取部门人员信息 旧 #region 获取部门人员信息 旧
//if (item.Nav_Department.DEPARTMENT_TYPE == 3 || item.Nav_Department.DEPARTMENT_TYPE == 0) //if (item.Nav_Department.DEPARTMENT_TYPE == 5 || item.Nav_Department.DEPARTMENT_TYPE == 10)
//{ //{
// // 公司 = 3 部门 = 0, // // 公司 = 3 部门 = 0,
// model.DEPARTMENT_ID = item.DEPARTMENT_ID; // model.DEPARTMENT_ID = item.DEPARTMENT_ID;
@ -579,7 +579,7 @@ namespace APT.SC.WebApi.Controllers.Api.OH
// model.Nav_Department = item.Nav_Department; // model.Nav_Department = item.Nav_Department;
//} //}
//else if (item.Nav_Department.DEPARTMENT_TYPE == 1) //else if (item.Nav_DepartmentDEPARTMENT_TYPE == 15)
//{ //{
// // 车间 = 1, // // 车间 = 1,
// model.DEPARTMENT_ID = item.Nav_Department.PARENT_ID; // model.DEPARTMENT_ID = item.Nav_Department.PARENT_ID;

12
APT.MicroApi/APT.SC.WebApi/Controllers/Api/PTController/AssessmentPlanAuditController.cs
View File

@ -477,7 +477,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
var chargeInfo = userInfos.FirstOrDefault(t => t.Nav_Person != null && t.Nav_Person.Nav_Post != null && t.Nav_Person.Nav_Post.NAME == "总经理"); var chargeInfo = userInfos.FirstOrDefault(t => t.Nav_Person != null && t.Nav_Person.Nav_Post != null && t.Nav_Person.Nav_Post.NAME == "总经理");
var chargeName = chargeInfo?.NAME; var chargeName = chargeInfo?.NAME;
//先取所有部门,配置为公司级 //先取所有部门,配置为公司级
var companyDeparts = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 0 || t.DEPARTMENT_TYPE == 3).OrderBy(m => m.NUM).ToList(); var companyDeparts = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 10 || t.DEPARTMENT_TYPE == 5).OrderBy(m => m.NUM).ToList();
if (companyDeparts != null && companyDeparts.Any()) if (companyDeparts != null && companyDeparts.Any())
{ {
foreach (var company in companyDeparts) foreach (var company in companyDeparts)
@ -494,7 +494,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
data.type = "(年度/季度/月度)"; data.type = "(年度/季度/月度)";
data.score = "1、80。2、20。"; data.score = "1、80。2、20。";
data.method = "1、方法一。2、方法二。"; data.method = "1、方法一。2、方法二。";
if (company.DEPARTMENT_TYPE == 3) if (company.DEPARTMENT_TYPE == 5)
data.company_num = 0; data.company_num = 0;
else else
data.company_num = 1; data.company_num = 1;
@ -503,7 +503,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
} }
} }
//取公司级所有人 //取公司级所有人
var companyDepartId = departmentInfos.FirstOrDefault(t => t.DEPARTMENT_TYPE == 3 && !t.NAME.Contains("安全环保管理部"))?.ID; var companyDepartId = departmentInfos.FirstOrDefault(t => t.DEPARTMENT_TYPE == 5 && !t.NAME.Contains("安全环保管理部"))?.ID;
var companyUsers = userInfos.Where(t => t.DEPARTMENT_ID == companyDepartId || (t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("副总"))).Distinct().ToList(); var companyUsers = userInfos.Where(t => t.DEPARTMENT_ID == companyDepartId || (t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("副总"))).Distinct().ToList();
if (companyUsers != null && companyUsers.Any()) if (companyUsers != null && companyUsers.Any())
{ {
@ -535,7 +535,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
} }
} }
//取部门级 //取部门级
var departInfos = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 0 || t.NAME.Contains("安全环保管理部")).OrderBy(t=>t.NUM).ToList(); var departInfos = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 10 || t.NAME.Contains("安全环保管理部")).OrderBy(t=>t.NUM).ToList();
if (departInfos != null && departInfos.Any()) if (departInfos != null && departInfos.Any())
{ {
foreach (var depart in departInfos) foreach (var depart in departInfos)
@ -601,7 +601,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
{ {
foreach (var item in departIds) foreach (var item in departIds)
{ {
var temp = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 1 && t.PARENT_ID == item).OrderBy(m=>m.NUM).ToList(); var temp = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 15 && t.PARENT_ID == item).OrderBy(m=>m.NUM).ToList();
shopInfos.AddRange(temp); shopInfos.AddRange(temp);
} }
} }
@ -661,7 +661,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
{ {
foreach (var item in shopIds) foreach (var item in shopIds)
{ {
var temp = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 2 && t.PARENT_ID == item).OrderBy(m=>m.NUM).ToList(); var temp = departmentInfos.Where(t => t.DEPARTMENT_TYPE == 20 && t.PARENT_ID == item).OrderBy(m=>m.NUM).ToList();
classInfos.AddRange(temp); classInfos.AddRange(temp);
} }
} }

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs
View File

@ -132,7 +132,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var currDep = GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.LAUNCH_DEPARTMENT_ID); var currDep = GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.LAUNCH_DEPARTMENT_ID);
if (currDep != null && (currDep.NAME == "安全环保管理部" || currDep.NAME == "安全环保科" || currDep.NAME == "安全环保部" || currDep.NAME == "安环部")) if (currDep != null && (currDep.NAME == "安全环保管理部" || currDep.NAME == "安全环保科" || currDep.NAME == "安全环保部" || currDep.NAME == "安环部"))
{ {
var manageUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE == 3 && t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)).Select(t => t.ID); var manageUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE == 5 && t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)).Select(t => t.ID);
allUsersIds.AddRange(manageUsers); allUsersIds.AddRange(manageUsers);
} }
var allSendUserIds = new List<Guid>(); var allSendUserIds = new List<Guid>();

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs
View File

@ -86,7 +86,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var currDep = GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.LAUNCH_DEPARTMENT_ID); var currDep = GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.LAUNCH_DEPARTMENT_ID);
if (currDep != null && (currDep.NAME == "安全环保管理部" || currDep.NAME == "安全环保科" || currDep.NAME == "安全环保部" || currDep.NAME == "安环部")) if (currDep != null && (currDep.NAME == "安全环保管理部" || currDep.NAME == "安全环保科" || currDep.NAME == "安全环保部" || currDep.NAME == "安环部"))
{ {
var manageUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE == 3 && t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(entity.ORG_ID)).Select(t => t.ID); var manageUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE == 5 && t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(entity.ORG_ID)).Select(t => t.ID);
allSendUserIds.AddRange(manageUsers); allSendUserIds.AddRange(manageUsers);
} }
var allUsers = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && allSendUserIds.Contains(t.ID) && !t.CODE.Contains("admin"), new BaseFilter(entity.ORG_ID)); var allUsers = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && allSendUserIds.Contains(t.ID) && !t.CODE.Contains("admin"), new BaseFilter(entity.ORG_ID));

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
View File

@ -114,7 +114,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID; item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID;
} }
else if (dep.DEPARTMENT_TYPE == 20) else if (dep.DEPARTMENT_TYPE == 200)
{ {
item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID; item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID;
} }

6
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SEThreeLevelTrainRecordController.cs
View File

@ -223,15 +223,15 @@ namespace APT.SC.WebApi.Controllers.Api.SE
ORG_ID = eduCard.ORG_ID, ORG_ID = eduCard.ORG_ID,
CONTENT_ID = train_contents.ID, CONTENT_ID = train_contents.ID,
}; };
if (nextTrainDep.DEPARTMENT_TYPE == 0) if (nextTrainDep.DEPARTMENT_TYPE == 10)
{ {
next_train_record.THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.部门级; next_train_record.THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.部门级;
} }
else if (nextTrainDep.DEPARTMENT_TYPE == 1) else if (nextTrainDep.DEPARTMENT_TYPE == 15)
{ {
next_train_record.THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.车间级; next_train_record.THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.车间级;
} }
else if (nextTrainDep.DEPARTMENT_TYPE == 2) else if (nextTrainDep.DEPARTMENT_TYPE == 20)
{ {
next_train_record.THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.班组级; next_train_record.THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.班组级;
} }

6
APT.MicroApi/APT.SC.WebApi/Controllers/Api/WBController/11HiddenDangerRecordController.cs
View File

@ -299,17 +299,17 @@ namespace APT.SC.WebApi.Controllers.Api.WB
{ {
return null; return null;
} }
else if (dep.DEPARTMENT_TYPE == 3) else if (dep.DEPARTMENT_TYPE == 5)
{ {
return null; return null;
} }
else if (dep.DEPARTMENT_TYPE == 0)// 部门=0, 车间=1, 班组=2, 公司=3 else if (dep.DEPARTMENT_TYPE == 10)// 部门=0, 车间=1, 班组=2, 公司=3
{ {
return dep.ID; return dep.ID;
} }
else if (dep.Nav_Parent != null) else if (dep.Nav_Parent != null)
{ {
if (dep.Nav_Parent.DEPARTMENT_TYPE == 0) if (dep.Nav_Parent.DEPARTMENT_TYPE == 10)
{ {
return dep.PARENT_ID.Value; return dep.PARENT_ID.Value;
} }

6
APT.MicroApi/APT.SC.WebApi/Controllers/Api/WBController/2WBRegisterController.cs
View File

@ -295,11 +295,11 @@ namespace APT.SC.WebApi.Controllers.Api.WB
var modelDep = GetEntity<T_FM_DEPARTMENT>(e => e.ID == project.LAUNCH_DEPARTMENT_ID.Value, "Nav_User"); var modelDep = GetEntity<T_FM_DEPARTMENT>(e => e.ID == project.LAUNCH_DEPARTMENT_ID.Value, "Nav_User");
if (modelDep != null) if (modelDep != null)
{ {
if (modelDep.DEPARTMENT_TYPE == 0 || modelDep.DEPARTMENT_TYPE == 3) if (modelDep.DEPARTMENT_TYPE == 10 || modelDep.DEPARTMENT_TYPE == 5)
{ {
fmDep = modelDep.Nav_User; fmDep = modelDep.Nav_User;
} }
else if (modelDep.DEPARTMENT_TYPE == 1) else if (modelDep.DEPARTMENT_TYPE == 15)
{ {
if (modelDep.PARENT_ID.HasValue) if (modelDep.PARENT_ID.HasValue)
{ {
@ -310,7 +310,7 @@ namespace APT.SC.WebApi.Controllers.Api.WB
} }
} }
} }
else if (modelDep.DEPARTMENT_TYPE == 2) else if (modelDep.DEPARTMENT_TYPE == 20)
{ {
modelDep = GetEntity<T_FM_DEPARTMENT>(modelDep.PARENT_ID.Value, null, "Nav_Parent.Nav_User"); modelDep = GetEntity<T_FM_DEPARTMENT>(modelDep.PARENT_ID.Value, null, "Nav_Parent.Nav_User");
if (modelDep.Nav_Parent != null && modelDep.Nav_Parent.Nav_User != null) if (modelDep.Nav_Parent != null && modelDep.Nav_Parent.Nav_User != null)

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -1397,7 +1397,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
T_SK_ENTERPRISE_LIBRARY_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DEPART(); T_SK_ENTERPRISE_LIBRARY_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DEPART();
de.DEPARTMENT_ID = item.ID; de.DEPARTMENT_ID = item.ID;
de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE == 0 ? SKDepartmentTypeEnum.部门级 : item.DEPARTMENT_TYPE == 3 ? SKDepartmentTypeEnum.公司级 : item.DEPARTMENT_TYPE == 1 ? SKDepartmentTypeEnum.车间级 : SKDepartmentTypeEnum.班组级; de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE == 10 ? SKDepartmentTypeEnum.部门级 : item.DEPARTMENT_TYPE == 5 ? SKDepartmentTypeEnum.公司级 : item.DEPARTMENT_TYPE == 15 ? SKDepartmentTypeEnum.车间级 : SKDepartmentTypeEnum.班组级;
de.Nav_Department = item; de.Nav_Department = item;
de.USER_ID = item.USER_ID; de.USER_ID = item.USER_ID;
de.Nav_User = item.Nav_User; de.Nav_User = item.Nav_User;

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs
View File

@ -80,7 +80,7 @@ namespace APT.SK.WebApi.Controllers.Api
var sendUser = entity.APPLY_USER_ID; var sendUser = entity.APPLY_USER_ID;
var depart = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); var depart = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
if (depart != null && depart.DEPARTMENT_TYPE == 2 && depart.USER_ID != null) if (depart != null && depart.DEPARTMENT_TYPE == 20 && depart.USER_ID != null)
{ {
sendUser = depart.USER_ID; sendUser = depart.USER_ID;
} }
@ -458,7 +458,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
//找安全员 如果没有 找负责人 //找安全员 如果没有 找负责人
// 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 // 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (master.Nav_Department.DEPARTMENT_TYPE == 2) if (master.Nav_Department.DEPARTMENT_TYPE == 20)
{ {
if (master.Nav_Department.USER_ID.HasValue) if (master.Nav_Department.USER_ID.HasValue)
{ {

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -181,7 +181,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_RISK_IDENTIFY> newData = new List<T_SK_RISK_IDENTIFY>(); List<T_SK_RISK_IDENTIFY> newData = new List<T_SK_RISK_IDENTIFY>();
if (result != null && result.Data != null && result.Data.Any()) if (result != null && result.Data != null && result.Data.Any())
{ {
var company = result.Data.FirstOrDefault(t => t.Nav_ApplyDepartment != null && t.Nav_ApplyDepartment.DEPARTMENT_TYPE == 3); var company = result.Data.FirstOrDefault(t => t.Nav_ApplyDepartment != null && t.Nav_ApplyDepartment.DEPARTMENT_TYPE == 5);
if (company != null) if (company != null)
{ {
newData.Add(company); newData.Add(company);