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

人员导入 功能添加

Browse Source 
子公司 自行导入 总公司人员 同步导入到各子公司
FMDepartmentType 修改
This commit is contained in:
wyw 2025-09-05 14:37:58 +08:00
parent 1fc1ff717e
commit 30a03a932d
44 changed files with 1237 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT.cs
View File

@ -45,7 +45,7 @@ namespace APT.BaseData.Domain.Entities.FM
public string LINE_USER { get; set; }
/// <summary>
/// 部门层级 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
/// 部门层级 FMDepartmentType 公司=5 部门=10, 车间=15, 班组=20,
/// </summary>
[Description("部门层级")]
[EnumName("FMDepartmentType")]

30
APT.BaseData.Domain/Enums/FM/FMEnums.cs
View File

@ -117,12 +117,34 @@ namespace APT.BaseData.Domain.Enums
MeetingJD = 50
}
/// <summary>
/// 组织层级
/// </summary>
public enum FMDepartmentType
{
部门 = 0,
车间 = 1,
班组 = 2,
公司 = 3
/// <summary>
/// 公司 5
/// </summary>
[Description("公司")]
Company = 5,
/// <summary>
/// 部门 10
/// </summary>
[Description("部门")]
Department = 10,
/// <summary>
/// 车间 15
/// </summary>
[Description("车间")]
Workshop = 15,
/// <summary>
/// 班组 20
/// </summary>
[Description("车间")]
Class = 20,
}
public enum FMTureOrFalse

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

@ -1572,7 +1572,7 @@ namespace APT.BaseData.Services.Services.FM
private Guid? GetApproveUser(T_PF_APPROVE_TEMP_DETAIL approveTempDetail, List<T_FM_USER> users, Guid loginUserId)
{
Guid? approveId = null;
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
var approveIds = users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t => t.ID).ToList();
if (approveIds.Count() == 0)
@ -1626,7 +1626,7 @@ namespace APT.BaseData.Services.Services.FM
var userTemp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (userTemp == null)
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
{
if (charge != null)
{
@ -1688,7 +1688,7 @@ namespace APT.BaseData.Services.Services.FM
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
if (chargeSafe != null)
{
@ -1750,7 +1750,7 @@ namespace APT.BaseData.Services.Services.FM
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
{
if (chargeK != null)
{
@ -1812,7 +1812,7 @@ namespace APT.BaseData.Services.Services.FM
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间安全员")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间安全员")
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp != null)
@ -1884,7 +1884,7 @@ namespace APT.BaseData.Services.Services.FM
private T_FM_USER GetApproveUserInfo(T_PF_APPROVE_TEMP_DETAIL approveTempDetail, List<T_FM_USER> users, Guid loginUserId)
{
T_FM_USER? approveUser = null;
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
approveUser = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID);
else
{

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

@ -3725,7 +3725,7 @@ namespace APT.BaseData.Services.DomainServices
var sendUsers = users.Distinct().ToList();
switch (entity.DEPARTMENT_TYPE)
{
case FMDepartmentType.公司:
case FMDepartmentType.Company:
sendUsers = users.Where(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "部门负责人" || t.Nav_ApproveRole.NAME == "安环部负责人").ToList();
var userInfoFirst = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人");
if (userInfoFirst == null && entity.ORG_ID.ToString() == "3efd5276-632b-e379-9ff3-7a7546591fca")
@ -3734,13 +3734,13 @@ namespace APT.BaseData.Services.DomainServices
sendUsers.Add(userInfo);
}
break;
case FMDepartmentType.部门:
case FMDepartmentType.Department:
sendUsers = users.Where(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "车间负责人").ToList();
break;
case FMDepartmentType.车间:
case FMDepartmentType.Workshop:
sendUsers = users.Where(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "班组负责人").ToList();
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
sendUsers = null;
//entity.STATUS = PFStandardStatus.Archived;
break;
@ -3863,7 +3863,7 @@ namespace APT.BaseData.Services.DomainServices
var sendUsers = users.Distinct().ToList();
switch (entity.DEPARTMENT_TYPE)
{
case FMDepartmentType.公司:
case FMDepartmentType.Company:
sendUsers = users.Where(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "部门负责人" || t.Nav_ApproveRole.NAME == "安环部负责人").ToList();
var userInfoFirst = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人");
if (userInfoFirst == null && entity.ORG_ID.ToString() == "3efd5276-632b-e379-9ff3-7a7546591fca")
@ -3872,10 +3872,10 @@ namespace APT.BaseData.Services.DomainServices
sendUsers.Add(userInfo);
}
break;
case FMDepartmentType.部门:
case FMDepartmentType.Department:
sendUsers = users.Where(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "班组负责人").ToList();
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
sendUsers = null;
entity.STATUS = PFStandardStatus.Archived;
break;
@ -3991,7 +3991,7 @@ namespace APT.BaseData.Services.DomainServices
entity.STATUS = PFStandardStatus.Archived;
List<string> userNames = new List<string>();
var userIds = entity.Nav_TeamDetail.Select(t => t.USER_ID.Value).Distinct().ToList();
if (entity.DEPARTMENT_TYPE != FMDepartmentType.班组)
if (entity.DEPARTMENT_TYPE != FMDepartmentType.Class)
{
var departmentIds = entity.Nav_DepartmentDetail.Select(t => t.DEPARTMENT_ID.Value).Distinct().ToList();
var userIdTemps = this.GetEntities<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.USER_ID != null && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(entity.ORG_ID)).Select(t => t.USER_ID.Value).Distinct().ToList();
@ -4006,16 +4006,16 @@ namespace APT.BaseData.Services.DomainServices
var name = "";
switch (entity.DEPARTMENT_TYPE)
{
case FMDepartmentType.公司:
case FMDepartmentType.Company:
name = "部门";
break;
case FMDepartmentType.部门:
case FMDepartmentType.Department:
name = "车间";
break;
case FMDepartmentType.车间:
case FMDepartmentType.Workshop:
name = "班组";
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
name = "个人";
break;
default:
@ -4053,7 +4053,7 @@ namespace APT.BaseData.Services.DomainServices
entity.STATUS = PFStandardStatus.Archived;
List<string> userNames = new List<string>();
var userIds = entity.Nav_TeamDetail.Select(t => t.USER_ID.Value).Distinct().ToList();
if (entity.DEPARTMENT_TYPE != FMDepartmentType.班组)
if (entity.DEPARTMENT_TYPE != FMDepartmentType.Class)
{
var departmentIds = entity.Nav_DepartmentDetail.Select(t => t.DEPARTMENT_ID.Value).Distinct().ToList();
var userIdTemps = this.GetEntities<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.USER_ID != null && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(entity.ORG_ID)).Select(t => t.USER_ID.Value).Distinct().ToList();
@ -4068,13 +4068,13 @@ namespace APT.BaseData.Services.DomainServices
var name = "";
switch (entity.DEPARTMENT_TYPE)
{
case FMDepartmentType.公司:
case FMDepartmentType.Company:
name = "部门";
break;
case FMDepartmentType.部门:
case FMDepartmentType.Department:
name = "班组";
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
name = "个人";
break;
default:
@ -4133,7 +4133,7 @@ namespace APT.BaseData.Services.DomainServices
{
formulationDepartment = new T_PT_INDICATOR_FORMULATION_DEPARTMENT();
formulationDepartment.ORG_ID = entity.ORG_ID;
formulationDepartment.DEPARTMENT_TYPE = FMDepartmentType.公司;
formulationDepartment.DEPARTMENT_TYPE = FMDepartmentType.Company;
formulationDepartment.STATUS = PFStandardStatus.Draft;
formulationDepartment.YEAR = entity.YEAR;
formulationDepartment.USER_ID = userInfo.ID;
@ -4142,14 +4142,14 @@ namespace APT.BaseData.Services.DomainServices
formulationDepartment.INDICATOR_FORMULATION_ID = entity.ID;
audit = new T_PT_ASSESSMENT_PLAN_AUDIT();
audit.ORG_ID = entity.ORG_ID;
audit.DEPARTMENT_TYPE = FMDepartmentType.公司;
audit.DEPARTMENT_TYPE = FMDepartmentType.Company;
audit.STATUS = PFStandardStatus.Draft;
audit.YEAR = entity.YEAR;
audit.USER_ID = userInfo.ID;
audit.DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
audit.SET_TIME = DateTime.Now;
audit.INDICATOR_FORMULATION_ID = entity.ID;
var departmentInfos = this.GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(entity.ORG_ID));
var departmentInfos = this.GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(entity.ORG_ID));
var departmentIds = departmentInfos.Select(m => m.ID).Distinct().ToList();
if (departmentIds.Any())
{
@ -4174,7 +4174,7 @@ namespace APT.BaseData.Services.DomainServices
var chargeIds = departmentInfos.Select(t => t.USER_ID).Distinct().ToList();
//var chargeAnotherIds = departmentInfos.Where(t=>t.USER_ID ==null).Select(t => t.CHARGEUSER_ID).Distinct().ToList();
//chargeIds.AddRange(chargeAnotherIds);
var userInfos = this.GetEntities<T_FM_USER>(t => (t.Nav_Department != null && (t.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司 || t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("副总")) && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && !t.NAME.Contains("管理员")) || chargeIds.Contains(t.ID), new BaseFilter(entity.ORG_ID)).ToList();
var userInfos = this.GetEntities<T_FM_USER>(t => (t.Nav_Department != null && (t.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company || t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("副总")) && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && !t.NAME.Contains("管理员")) || chargeIds.Contains(t.ID), new BaseFilter(entity.ORG_ID)).ToList();
if (userInfos != null && userInfos.Any())
{
foreach (var info in userInfos)
@ -4790,7 +4790,7 @@ namespace APT.BaseData.Services.DomainServices
riskRecord.START_TIME = DateTime.Now;
riskRecord.ORG_ID = entity.ORG_ID;
riskRecord.STATUS = (int)FOPreMeetingStatusEnum.草稿;
riskRecord.LEVEL = FMDepartmentType.部门;
riskRecord.LEVEL = FMDepartmentType.Department;
riskRecord.REQUEST_ID = request.ID;
riskRecord.NOTE_TAKER_ID = chargeUserId;
riskRecord.INITIATING_DEPARTMENT = entity.DEPARTMENT_ID;
@ -6089,7 +6089,7 @@ namespace APT.BaseData.Services.DomainServices
string sendName = "";
var sendUser = new T_FM_USER();
if (entity.LEVEL == FMDepartmentType.公司)
if (entity.LEVEL == FMDepartmentType.Company)
{
var approveRole = GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员").ID;
sendUser = GetEntity<T_FM_USER>(t => t.APPROVE_ROLE_ID == approveRole && t.ENABLE_STATUS == 0);
@ -6105,12 +6105,12 @@ namespace APT.BaseData.Services.DomainServices
var userDepartmentId = GetEntity<T_FM_USER>(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID;
var department = GetEntity<T_FM_DEPARTMENT>(userDepartmentId.ToString());
Guid departmentId = Guid.Empty;
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
var tempDepartment = GetEntity<T_FM_DEPARTMENT>(t => t.ID == department.PARENT_ID).PARENT_ID;
departmentId = GetEntity<T_FM_DEPARTMENT>(t => t.ID == tempDepartment).ID;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
departmentId = GetEntity<T_FM_DEPARTMENT>(t => t.ID == department.PARENT_ID).ID;
}
@ -6408,7 +6408,7 @@ namespace APT.BaseData.Services.DomainServices
string sendName = "";
var sendUser = new T_FM_USER();
if (entity.LEVEL == FMDepartmentType.公司)
if (entity.LEVEL == FMDepartmentType.Company)
{
var approveRole = GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员").ID;
sendUser = GetEntity<T_FM_USER>(t => t.APPROVE_ROLE_ID == approveRole && t.ENABLE_STATUS == 0);
@ -6424,12 +6424,12 @@ namespace APT.BaseData.Services.DomainServices
var userDepartmentId = GetEntity<T_FM_USER>(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID;
var department = GetEntity<T_FM_DEPARTMENT>(userDepartmentId.ToString());
Guid departmentId = Guid.Empty;
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
var tempDepartment = GetEntity<T_FM_DEPARTMENT>(t => t.ID == department.PARENT_ID).PARENT_ID;
departmentId = GetEntity<T_FM_DEPARTMENT>(t => t.ID == tempDepartment).ID;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
departmentId = department.ID;
}
@ -11328,7 +11328,7 @@ namespace APT.BaseData.Services.DomainServices
{
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Archived;
var reportDetails = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t=>t.HIDDEN_DANGER_REPORT_ID == entity.ID,new BaseFilter(entity.ORG_ID), "Nav_ReportDetailFiles", "Nav_ReportDetailBasics");
var reportDetails = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_ReportDetailFiles", "Nav_ReportDetailBasics");
//List<T_SK_HIDDEN_DANGER_REPORT_DETAIL> reportDetails = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL>();
List<T_FM_NOTIFICATION_TASK> sendNotices = new List<T_FM_NOTIFICATION_TASK>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> records = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>();
@ -11486,7 +11486,7 @@ namespace APT.BaseData.Services.DomainServices
var checkUser = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID);
if (checkUser != null)
{
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报表("+ DateTime.Now.ToShortDateString().Replace("/", "") + ")-确认", entity.ID, entity.ORG_ID, checkUser.ID, checkUser.NAME, DateTime.Now,
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-确认", entity.ID, entity.ORG_ID, checkUser.ID, checkUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK014_SHOWPRINT");
sendNotices.Add(sendNotice);
}
@ -14277,7 +14277,7 @@ namespace APT.BaseData.Services.DomainServices
private Guid? GetApproveUser(T_PF_APPROVE_TEMP_DETAIL approveTempDetail, List<T_FM_USER> users, Guid loginUserId)
{
Guid? approveId = null;
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
var approveIds = users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t => t.ID).ToList();
if (approveIds.Count() == 0)
@ -14331,7 +14331,7 @@ namespace APT.BaseData.Services.DomainServices
var userTemp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (userTemp == null)
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
{
if (charge != null)
{
@ -14390,7 +14390,7 @@ namespace APT.BaseData.Services.DomainServices
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
if (chargeSafe != null)
{
@ -14449,7 +14449,7 @@ namespace APT.BaseData.Services.DomainServices
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
{
if (chargeK != null)
{

4
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckMainController.cs
View File

@ -340,8 +340,8 @@ namespace APT.BS.WebApi.Controllers.Api
//modelArea.MODIFIER_ID =;
modelArea.STATUS = STATUSEnum.启用;
//modelArea.DEPARTMENT_ID =;
modelArea.LEVEL = BaseData.Domain.Enums.FMDepartmentType.公司;
modelArea.LEVEL = BaseData.Domain.Enums.FMDepartmentType.公司;
modelArea.LEVEL = BaseData.Domain.Enums.FMDepartmentType.Company;
modelArea.LEVEL = BaseData.Domain.Enums.FMDepartmentType.Company;
listModelArea.Add(modelArea);
listAreaAdd.Add(modelArea);

8
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs
View File

@ -420,16 +420,16 @@ namespace APT.BS.WebApi.Controllers.Api
{
T_FM_USER user = new T_FM_USER();
var modelDep = GetEntity<T_FM_DEPARTMENT>(modelUser.DEPARTMENT_ID.Value);
if (modelDep.DEPARTMENT_TYPE != (int)FMDepartmentType.部门)
if (modelDep.DEPARTMENT_TYPE != (int)FMDepartmentType.Department)
{
do
{
modelDep = GetEntity<T_FM_DEPARTMENT>(e => e.ID == modelDep.PARENT_ID);
} while (modelDep.DEPARTMENT_TYPE != (int)FMDepartmentType.部门 && modelDep.PARENT_ID.HasValue);
} while (modelDep.DEPARTMENT_TYPE != (int)FMDepartmentType.Department && modelDep.PARENT_ID.HasValue);
}
if (modelDep.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
if (modelDep.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
var approveRol = GetEntity<T_PF_APPROVAL_ROLE>(e => e.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && e.NAME.Contains("负责人"));
var approveRol = GetEntity<T_PF_APPROVAL_ROLE>(e => e.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && e.NAME.Contains("负责人"));
if (approveRol != null)
{
user = GetEntity<T_FM_USER>(e => e.APPROVE_ROLE_ID == approveRol.ID && e.DEPARTMENT_ID == modelDep.ID);

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

@ -205,7 +205,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
[HttpPost, Route("WorkShopTreeData")]
public JsonActionResult<IEnumerable<TreeNode<T_FM_DEPARTMENT>>> WorkShopTreeData([FromBody] KeywordFilter filter)
{
return WitTreeOrderEntities(i => i.DEPARTMENT_TYPE == (int)FMDepartmentType.车间, filter);
return WitTreeOrderEntities(i => i.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop, filter);
}
@ -310,7 +310,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
}).Where(n => !(!sIds.Contains(n.ID) && n.IS_DELETED == true)).ToList();
//获取所有排班单元（排除当前配置项）
var spanList = this.GetEntities<T_FM_DEPARTMENT>(n => n.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && n.ID != entity.ID, filter);
var spanList = this.GetEntities<T_FM_DEPARTMENT>(n => n.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && n.ID != entity.ID, filter);
//获取要删除的排班信息（排除当前排班单元）
var delIds = shiftList.Where(s => s.DEPARTMENT_ID != entity.ID).Select(d => d.ID).ToList();
//获取要删除排班明细表的数据
@ -371,7 +371,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
//var safeUser = entity==null?null:entity.Nav_SafeUser;
//entity.Nav_SafeUser = null;
T_FM_TEAM teamInfo = null;
if (entity.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (entity.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
teamInfo = this.GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == entity.ID);
if (teamInfo == null)

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

@ -50,7 +50,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
baseFilter.Level = -1;
baseFilter.IsParentData = false;
baseFilter.SelectField = new string[] { "ID" };
var workShops = this.GetEntities<T_FM_DEPARTMENT>(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.车间, baseFilter);
var workShops = this.GetEntities<T_FM_DEPARTMENT>(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop, baseFilter);
string[] Day = new string[] { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" };
foreach (var nodelModel in workShops)
{

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

@ -1279,7 +1279,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
user.ENABLE_STATUS = 1;
}
T_FM_TEAM_PERSON teamPerson = new T_FM_TEAM_PERSON();
if (user.ENABLE_STATUS == 0 && department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (user.ENABLE_STATUS == 0 && department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
var teamInfo = this.GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == new Guid(filter.Parameter3));
if (teamInfo == null)
@ -1292,7 +1292,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
this.UnifiedCommit(() =>
{
this.UpdateEntityNoCommit(user);
if (user.ENABLE_STATUS == 0 && department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (user.ENABLE_STATUS == 0 && department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
this.AddEntityNoCommit(teamPerson);
}

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

@ -1,19 +1,28 @@
using APT.BaseData.Domain.ApiModel.PF;
using APT.BaseData.Domain.ApiModel;
using APT.BaseData.Domain.ApiModel.PF;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities.OP;
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Enums.OP;
using APT.BaseData.Domain.IServices;
using APT.BaseData.Domain.IServices.FM;
using APT.Infrastructure.Api;
using APT.Infrastructure.Core;
using APT.Migrations;
using APT.MS.Domain.Entities.BS;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Entities.PF;
using APT.MS.Domain.Enums;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
using System.Security.Cryptography;
namespace APT.BS.WebApi.Controllers.Api
{
@ -681,5 +690,951 @@ namespace APT.BS.WebApi.Controllers.Api
}
}
}
#region 用户信息导入
/// <summary>
/// 获取导入数据
/// 参考 [Route("api/PF/Import")]
/// </summary>
/// <returns></returns>
[HttpPost, Route("DataImport")]
public JsonActionResult<ImportDataModel> DataImport()
{
return SafeExecute<ImportDataModel>(() =>
{
string telnetCode = Request.Headers["Tenant"];
var httpRequest = this.HttpContext.Request;
string orgIdStr = httpRequest.Form["OrgId"];// 获取 组织
Guid? orgId = null;
if (!string.IsNullOrEmpty(orgIdStr))
orgId = new Guid(orgIdStr);
else
return null;
ImportDataModel result = new ImportDataModel();
var dic = Path.Combine(System.AppContext.BaseDirectory, "tempImportFiles");
if (!Directory.Exists(dic))
Directory.CreateDirectory(dic);
foreach (var key in httpRequest.Form.Files) // 文件键
{
var postedFile = key; // 获取文件键对应的文件对象
string filePath = Path.Combine(dic, DateTime.Now.ToString("yyyy_MM_dd_hh_mm_ss") + "_" + postedFile.FileName);
Byte[] fileData = new Byte[postedFile.Length];
Stream sr = postedFile.OpenReadStream();//创建数据流对象
sr.Read(fileData, 0, (int)postedFile.Length);
using (FileStream fs = new FileStream(filePath, FileMode.CreateNew))
{
fs.Write(fileData, 0, fileData.Length);
fs.Flush();
fs.Close();
}
//获取数据
Dictionary<int, int> startRowIndexs = new Dictionary<int, int>();
startRowIndexs.Add(0, 0);//根据Excel格式数据赋值
DataSet dataTables = FileUtils.ReadExcelByOledb(filePath, startRowIndexs);
string Msg = string.Empty;
bool isOK = InsertModel(dataTables.Tables[0], orgId.Value, telnetCode, ref Msg);
try
{
System.IO.File.Delete(filePath);
}
catch { }
result.Data = Msg;
result.MessageList = new List<string> { Msg };
}
return result;
});
}
/// <summary>
/// 数据插入
/// </summary>
/// <param name="dtSource"></param>
/// <param name="OrgID"></param>
/// <param name="telnetCode"></param>
/// <param name="Msg"></param>
/// <param name="rowIndex"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public bool InsertModel(DataTable dtSource, Guid OrgID, string telnetCode, ref string Msg, int rowIndex = 3)
{
//0:公司名称* 1:部门名称 2:部门编号 3:车间名称 4:车间编号 5:班组名称 6:班组编号
//7:姓名* 8:工号 * 9:手机号码 * 10:身份证号 11:岗位 12:性别* 13:入职日期 14:工龄 15:审批角色 16:操作角色 *
//注意事项：
//1、公司名称必填，每次导入有且仅有一个公司名称
//2、人员所在组织（公司、部门、车间、班组）必须确切，例如：公司领导只填【公司名称】，班组员工必须填完整【公司名称、部门名称、车间名称、班组名称】
//3、姓名、工号、手机号码、岗位、性别、操作角色必填
//4、字段说明：各组织名称不能重复；【组织编号】如果为空，系统会自动生成；【工号】系统登录唯一标识符，不能重复；初始密码规则：姓名首字母大写 + 工号数字，例句的初始密码为：Wjl00088；【手机号码】：11位数字；【身份证号码】：18位数字；【性别】：男 / 女;【入职日期】必须是yyyy - MM - dd格式(例如：2025 - 01 - 01)；【工龄】为正数；【操作角色】必须是系统已配置信息，如有多个用英文分号【;】分割
//5、此表单导入会自动添加：组织、人员、岗位、审批角色信息
//6、如果是总部人员，需要自动添加到各子公司：公司名称以{【总部】}结尾，人员只能添加到子公司的公司级，并且组织、角色、岗位等不自动处理
//7、首行为例句，不能删除，直接从序号【5】开始填写
if (dtSource == null || dtSource.Rows.Count < 0 || dtSource.Rows.Count < rowIndex)
{
Msg = "未获取到导入数据";
throw new Exception(Msg);
}
List<int> listNotEmpty = new List<int>() { 0, 7, 8, 9, 12, 16 };
//使用组织 T_FM_DEPARTMENT
//物料类型 T_TI_SAFE_PDT_COST_RECORD_TYPE T_TI_COST_TYPE
//记录人 T_FM_USER
#region 定义变量
bool isHead = false;//是否总部 新增 是 得全子公司添加登录信息
bool isAddUser = false;//是否新增人员 是角色信息得新增 否 查询后处理
bool isAdddep5 = false;//是否新增 公司
DateTime dtNow = DateTime.Now;
Dictionary<int, List<int>> dicIndexEmpty = new Dictionary<int, List<int>>();
List<T_FM_DEPARTMENT> listDepAll = GetEntities<T_FM_DEPARTMENT>(e => e.ENABLE_STATUS == 0, null).ToList();
List<T_FM_USER> listUSER = GetEntities<T_FM_USER>(e => e.ENABLE_STATUS == 0, null).ToList();
List<T_FM_PERSON> listPerson = GetEntities<T_FM_PERSON>(null, null).ToList();
List<T_FM_USER_POST> listUserPost = GetEntities<T_FM_USER_POST>(e => e.STATUS == ((int)FMPostStatusType.启用), null).ToList();
List<T_PF_APPROVAL_ROLE> listApproveRole = GetEntities<T_PF_APPROVAL_ROLE>(null, null).ToList();//导入自动添加
List<T_FM_USER_BELONG_ROLE> listUserRole = GetEntities<T_FM_USER_BELONG_ROLE>(null, null).ToList();
List<T_FM_ROLE> listRole = GetEntities<T_FM_ROLE>(null, null).ToList();//不做添加 平台类型前端不好改
List<T_FM_DEPARTMENT> listDepAdd = new List<T_FM_DEPARTMENT>();//需要新增的组织
List<T_FM_USER> listUserAdd = new List<T_FM_USER>();//新增用户
List<T_FM_PERSON> listPersonAdd = new List<T_FM_PERSON>();//新增人员
List<T_FM_USER_POST> listUserPostAdd = new List<T_FM_USER_POST>();//新增岗位
List<T_PF_APPROVAL_ROLE> listApproveRoleAdd = new List<T_PF_APPROVAL_ROLE>();//新增审批角色
List<T_FM_USER_BELONG_ROLE> listUserRoleAdd = new List<T_FM_USER_BELONG_ROLE>();//添加人员角色绑定
//公司名称 0
T_FM_DEPARTMENT dep5 = null;
string strDep5 = string.Empty;
//List<string> listStrDepartmentName5 = new List<string>();
//T_FM_DEPARTMENT modelDep5 = new T_FM_DEPARTMENT();
//List<string> listDepName5 = new List<string>();
//List<int> listDepartment5Index = new List<int>();
//部门名称 1
List<T_FM_DEPARTMENT> listDep10 = listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 10).ToList();
string strDep10 = string.Empty;
List<string> listStrDepartmentName10 = new List<string>();
T_FM_DEPARTMENT modelDep10 = new T_FM_DEPARTMENT();
List<string> listDepName10 = new List<string>();
List<int> listDepartment10Index = new List<int>();
//车间名称 3
List<T_FM_DEPARTMENT> listDep15 = listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 15).ToList();
string strDep15 = string.Empty;
List<string> listStrDepartmentName15 = new List<string>();
T_FM_DEPARTMENT modelDep15 = new T_FM_DEPARTMENT();
List<string> listDepName15 = new List<string>();
List<int> listDepartment15Index = new List<int>();
//班组名称 5
List<T_FM_DEPARTMENT> listDep20 = listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 10).ToList();
string strDep20 = string.Empty;
List<string> listStrDepartmentName20 = new List<string>();
T_FM_DEPARTMENT modelDep20 = new T_FM_DEPARTMENT();
List<string> listDepName20 = new List<string>();
List<int> listDepartment20Index = new List<int>();
//姓名 7
List<int> listNAMEIndex = new List<int>();
List<string> listStrNAME = new List<string>();
string strNAME = string.Empty;
T_FM_USER modelUser = new T_FM_USER();
T_FM_PERSON modelPerson = new T_FM_PERSON();
//工号 8
List<int> listCODEIndex = new List<int>();
List<string> listStrCODE = new List<string>();
string strCODE = string.Empty;
//手机号码 9
List<int> listPHONEIndex = new List<int>();
List<string> listStrPHONE = new List<string>();
string strPHONE = string.Empty;
//身份证号 10
string strID_CARD = string.Empty;
List<int> listID_CARDIndex = new List<int>();
List<string> listStrID_CARD = new List<string>();
//岗位 11
List<int> listPostIndex = new List<int>();
List<string> listStrPost = new List<string>();
string strPost = string.Empty;
List<string> listPostName = new List<string>();
T_FM_USER_POST modelPost = null;
//性别 12
string strSEX = string.Empty;
List<int> listSEXIndex = new List<int>();
List<string> listStrSEX = new List<string>();
//入职日期 13
string strENTRYTIME = string.Empty;
DateTime? dtENTRYTIME = null;
List<int> listENTRYTIMEIndex = new List<int>();
List<string> listStrENTRYTIME = new List<string>();
//工龄 14
string strWORKINGYEAR = string.Empty;
int? WORKINGYEAR = null;
List<int> listWORKINGYEARIndex = new List<int>();
List<string> listStrWORKINGYEAR = new List<string>();
//审批角色 15
string strApproveRole = string.Empty;
List<string> listStrApproveRole = new List<string>();
T_PF_APPROVAL_ROLE modelApproveRole = new T_PF_APPROVAL_ROLE();
List<string> listApproveRoleName = new List<string>();
List<int> listApproveRoleIndex = new List<int>();
//操作角色 16
string strRole = string.Empty;
char[] charSplit = new char[] { ';', '；' };
List<string> listStrRole = new List<string>();
List<T_FM_ROLE> listRoleItem = new List<T_FM_ROLE>();
List<string> listRoleName = new List<string>();
List<int> listRoleIndex = new List<int>();
T_FM_USER_BELONG_ROLE modelUserRole = null;
//0:公司名称* 1:部门名称 2:部门编号 3:车间名称 4:车间编号 5:班组名称 6:班组编号
//7:姓名* 8:工号 * 9:手机号码 * 10:身份证号 11:岗位 12:性别* 13:入职日期 14:工龄 15:审批角色 16:操作角色 *
List<int> listDepartment13Index = new List<int>();//部门为空 车间不为空
List<int> listDepartment35Index = new List<int>();//车间为空 班组不为空
#endregion
#region 数据判断
//第一行是标题 跳过
int rowAll = dtSource.Rows.Count;
strDep5 = dtSource.Rows[rowIndex][0].ToString().Trim();
if (!string.IsNullOrEmpty(strDep5))
{
#region 公司 总部 处理 dep5
if (strDep5.EndsWith("【总部】"))
{
isHead = true;
strDep5 = strDep5.Replace("【总部】", "");
}
dep5 = listDepAll.FirstOrDefault(e => e.NAME == strDep5 && e.DEPARTMENT_TYPE == 5);
if (dep5 == null)
{
isAdddep5 = true;
//没有找到初始化信息
dep5 = new T_FM_DEPARTMENT();
try
{
string strOrgID = OrgID.ToString();
var listIDs = strOrgID.Split('-');
string strID = string.Empty;
for (int i = 0; i < listIDs.Length; i++)
{
if (i == 1)
{
listIDs[i] = "4" + listIDs[i].Substring(1, listIDs[i].Length - 1);
}
strID += listIDs[i];
}
dep5.ID = new Guid(strID);
dep5.CREATE_TIME = dtNow;
}
catch
{
dep5.ID = Guid.NewGuid();
dep5.CREATE_TIME = dtNow;
}
dep5.ORG_ID = OrgID;
dep5.NAME = strDep5;
dep5.DEPARTMENT_TYPE = 5;
dep5.CODE = DataHelper.MkPinyinString(dep5.NAME) + "00";
listDepAdd.Add(dep5);
listDepAll.Add(dep5);
}
#endregion
}
MD5 md5 = MD5.Create();
string nameHead = string.Empty;
string code = string.Empty;
string NewPwd = string.Empty;
for (int i = rowIndex; i < rowAll; i++)
{
#region 不能为空
List<int> listi = null;
for (int j = 0; j < 17; j++)
{
if (!listNotEmpty.Contains(j))
continue;
if (string.IsNullOrEmpty(dtSource.Rows[i][j].ToString().Trim()))
{
if (listi == null)
{
listi = new List<int>();
}
listi.Add(j);
}
}
if (listi != null)
dicIndexEmpty.Add(i + rowIndex, listi);//有空的 直接添加
#endregion
#region 部门名称 1 部门编号 2
strDep10 = dtSource.Rows[i][1].ToString().Trim();
if (!string.IsNullOrEmpty(strDep10))
{
modelDep10 = listDepAll.FirstOrDefault(e => e.NAME == strDep10);
if (modelDep10 != null && modelDep10.DEPARTMENT_TYPE != 10)
{
if (!listDepName10.Contains(strDep10))
{
listDepName10.Add(strDep10);
}
listDepartment10Index.Add(i + rowIndex);
}
if ((modelDep10 == null || modelDep10.ID == Guid.Empty) && !listDepartment10Index.Contains(i + rowIndex))
{
modelDep10 = new T_FM_DEPARTMENT();
modelDep10.ID = Guid.NewGuid();
modelDep10.NAME = strDep10;
modelDep10.ORG_ID = OrgID;
modelDep10.CODE = dtSource.Rows[i][2].ToString().Trim();
modelDep10.PARENT_ID = dep5.ID;
modelDep10.DEPARTMENT_TYPE = 10;
modelDep10.ENABLE_STATUS = 0;
modelDep10.CREATE_TIME = dtNow;
if (string.IsNullOrEmpty(modelDep10.CODE))
{
modelDep10.CODE = dep5.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 10).Count() + 1).ToString().PadLeft(2, '0');
}
listDepAdd.Add(modelDep10);
listDepAll.Add(modelDep10);
}
}
else
{
modelDep10 = null; //数据为空 model 置为 null
}
#endregion
#region 车间名称 3 车间编号 4
strDep15 = dtSource.Rows[i][3].ToString().Trim();
if (!string.IsNullOrEmpty(strDep15))
{
if (modelDep10 == null)
{
listDepartment13Index.Add(i + rowIndex);
}
else
{
modelDep15 = listDepAll.FirstOrDefault(e => e.NAME == strDep15);
if (modelDep15 != null && modelDep15.DEPARTMENT_TYPE != 15)
{
if (!listDepName15.Contains(strDep15))
{
listDepName15.Add(strDep15);
}
listDepartment15Index.Add(i + rowIndex);
}
if ((modelDep15 == null || modelDep15.ID == Guid.Empty) && !listDepartment15Index.Contains(i + rowIndex))
{
modelDep15 = new T_FM_DEPARTMENT();
modelDep15.ID = Guid.NewGuid();
modelDep15.NAME = strDep15;
modelDep15.ORG_ID = OrgID;
modelDep15.CODE = dtSource.Rows[i][4].ToString().Trim();
modelDep15.PARENT_ID = modelDep10.ID;
modelDep15.ENABLE_STATUS = 0;
modelDep15.DEPARTMENT_TYPE = 15;
modelDep15.CREATE_TIME = dtNow;
if (string.IsNullOrEmpty(modelDep15.CODE))
{
modelDep15.CODE = modelDep10.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 15).Count() + 1).ToString().PadLeft(2, '0');
}
listDepAdd.Add(modelDep15);
listDepAll.Add(modelDep15);
}
}
}
else
{
modelDep15 = null; //数据为空 model 置为 null
}
#endregion
#region 班组名称 5 班组编号 6
strDep20 = dtSource.Rows[i][5].ToString().Trim();
if (!string.IsNullOrEmpty(strDep20))
{
if (modelDep10 == null)
{
listDepartment35Index.Add(i + rowIndex);
}
else
{
modelDep20 = listDepAll.FirstOrDefault(e => e.NAME == strDep20);
if (modelDep20 != null && modelDep20.DEPARTMENT_TYPE != 20)
{
if (!listDepName20.Contains(strDep20))
{
listDepName20.Add(strDep20);
}
listDepartment20Index.Add(i + rowIndex);
}
if ((modelDep20 == null || modelDep20.ID == Guid.Empty) && !listDepartment20Index.Contains(i + rowIndex))
{
modelDep20 = new T_FM_DEPARTMENT();
modelDep20.ID = Guid.NewGuid();
modelDep20.NAME = strDep20;
modelDep20.ORG_ID = OrgID;
modelDep20.CODE = dtSource.Rows[i][6].ToString().Trim();
modelDep20.PARENT_ID = modelDep15.ID;
modelDep20.ENABLE_STATUS = 0;
modelDep20.DEPARTMENT_TYPE = 20;
modelDep20.CREATE_TIME = dtNow;
if (string.IsNullOrEmpty(modelDep20.CODE))
{
modelDep20.CODE = modelDep15.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 20).Count() + 1).ToString().PadLeft(2, '0');
}
listDepAdd.Add(modelDep20);
listDepAll.Add(modelDep20);
}
}
}
else
{
modelDep20 = null; //数据为空 model 置为 null
}
#endregion
#region 姓名 7 工号 8
isAddUser = false;
if (!listDepartment13Index.Contains(i + rowIndex) && !listDepartment35Index.Contains(i + rowIndex))
{
//组织信息 对 才进来判断
strNAME = dtSource.Rows[i][7].ToString().Trim();
strCODE = dtSource.Rows[i][8].ToString().Trim();
#region 手机号码 9 strPHONE
strPHONE = dtSource.Rows[i][9].ToString().Trim();
if (!string.IsNullOrEmpty(strPHONE) && strPHONE.Length != 11)
{
if (!listStrPHONE.Contains(strPHONE))
{
listStrPHONE.Add(strPHONE);
}
listPHONEIndex.Add(i + rowIndex);
}
#endregion
#region strID_CARD 身份证号 10
strID_CARD = dtSource.Rows[i][10].ToString().Trim();
if (!string.IsNullOrEmpty(strID_CARD) && strID_CARD.Length != 18)
{
if (listStrID_CARD.Contains(strID_CARD))
{
listStrID_CARD.Add(strID_CARD);
}
listID_CARDIndex.Add(i + rowIndex);
}
#endregion
#region 性别 12 strSEX
strSEX = dtSource.Rows[i][12].ToString().Trim();
if (!string.IsNullOrEmpty(strSEX) && strSEX != "男" && strSEX != "女")
{
if (!listStrSEX.Contains(strSEX))
{
listStrSEX.Add(strSEX);
}
listSEXIndex.Add(i + rowIndex);
}
#endregion
#region 岗位 modelPost 11
strPost = dtSource.Rows[i][11].ToString().Trim();
if (!string.IsNullOrEmpty(strPost))
{
modelPost = listUserPost.FirstOrDefault(e => e.NAME == strPost);
if (modelPost == null)
{
modelPost = new T_FM_USER_POST();
modelPost.ID = Guid.NewGuid();
modelPost.ORG_ID = OrgID;
modelPost.NAME = strPost;
modelPost.CODE = "POST" + (listUserPost.Count() + 1).ToString().PadLeft(3, '0');
modelPost.CREATE_TIME = dtNow;
modelPost.STATUS = (int)FMPostStatusType.启用;
listUserPostAdd.Add(modelPost);
listUserPost.Add(modelPost);
}
}
else
{
modelPost = null;
}
#endregion
#region 入职日期 dtENTRYTIME 13
strENTRYTIME = dtSource.Rows[i][13].ToString().Trim();
if (!string.IsNullOrEmpty(strENTRYTIME))
{
try
{
dtENTRYTIME = Convert.ToDateTime(strENTRYTIME);
}
catch
{
if (!listStrENTRYTIME.Contains(strENTRYTIME))
{
listStrENTRYTIME.Add(strENTRYTIME);
}
listENTRYTIMEIndex.Add(i + rowIndex);
}
}
else
{
dtENTRYTIME = null;
}
#endregion
#region 工龄 WORKINGYEAR 14
strWORKINGYEAR = dtSource.Rows[i][14].ToString().Trim();
if (!string.IsNullOrEmpty(strWORKINGYEAR))
{
try
{
WORKINGYEAR = int.Parse(strWORKINGYEAR);
}
catch
{
if (!listStrWORKINGYEAR.Contains(strWORKINGYEAR))
{
listStrWORKINGYEAR.Add(strWORKINGYEAR);
}
listWORKINGYEARIndex.Add(i + rowIndex);
}
}
else
{
WORKINGYEAR = null;
}
#endregion
#region 审批角色 15
strApproveRole = dtSource.Rows[i][15].ToString().Trim();
if (!string.IsNullOrEmpty(strApproveRole))
{
modelApproveRole = listApproveRole.FirstOrDefault(e => e.NAME == strApproveRole);
if (modelApproveRole == null)
{
modelApproveRole = new T_PF_APPROVAL_ROLE();
modelApproveRole.ID = Guid.NewGuid();
modelApproveRole.ORG_ID = OrgID;
modelApproveRole.NAME = strPost;
modelApproveRole.CODE = DataHelper.MkPinyinString(modelApproveRole.NAME) + (listApproveRoleAdd.Count() + 1).ToString().PadLeft(2, '0');
modelApproveRole.CREATE_TIME = dtNow;
listApproveRoleAdd.Add(modelApproveRole);
listApproveRole.Add(modelApproveRole);
}
}
else
{
modelApproveRole = null;
}
#endregion
#region 操作角色 16
strRole = dtSource.Rows[i][16].ToString().Trim();
if (!string.IsNullOrEmpty(strRole))
{
listStrRole = strRole.Split(charSplit, StringSplitOptions.RemoveEmptyEntries).ToList();
listRoleItem = listRole.FindAll(e => listStrRole.Contains(e.NAME)).ToList();
}
else
{
listRoleItem = null;
}
#endregion
#region 数据组装
if (!string.IsNullOrEmpty(strNAME) && !string.IsNullOrEmpty(strCODE) && dicIndexEmpty.Count < 1 && listDepartment10Index.Count < 1 && listDepartment15Index.Count < 1 && listDepartment13Index.Count < 1 && listDepartment35Index.Count < 1 && listPHONEIndex.Count < 1 && listID_CARDIndex.Count < 1 && listSEXIndex.Count < 1 && listENTRYTIMEIndex.Count < 1 && listWORKINGYEARIndex.Count < 1)
{
modelUser = listUSER.FirstOrDefault(e => e.NAME == strNAME && e.CODE == strCODE);
modelPerson = listPerson.FirstOrDefault(e => e.NAME == strNAME && e.CODE == strCODE);
if (modelUser == null)
{
isAddUser = true;
modelUser = new T_FM_USER();
modelUser.ID = Guid.NewGuid();
modelUser.CREATE_TIME = dtNow;
}
//if (modelUser == null)
//{
// isAddUser = true;
// modelUser = new T_FM_USER();
// modelUser.ID = Guid.NewGuid();
modelUser.ORG_ID = OrgID;
modelUser.NAME = strNAME;
modelUser.CODE = strCODE;
modelUser.PHONE = strPHONE;
modelUser.SEX = (strSEX == "男" ? FMSexEnum.男.GetInt() : FMSexEnum.女.GetInt());
nameHead = DataHelper.MkPinyinString(modelUser.NAME);
code = DataHelper.GetCodeNO(modelUser.CODE);
NewPwd = DataHelper.MD5Encrypt32(md5, nameHead + code);
modelUser.PASSWORD = NewPwd;
//班组 车间 部门 公司 顺序去找部门
modelUser.DEPARTMENT_ID = (modelDep20 != null ? modelDep20.ID : (modelDep15 != null ? modelDep15.ID : (modelDep10 != null ? modelDep10.ID : dep5.ID)));
modelUser.ID_CARD = strID_CARD;
if (dtENTRYTIME.HasValue)
{
modelUser.ENTRYTIME = dtENTRYTIME.Value;
}
modelUser.WORKINGYEAR = (WORKINGYEAR.HasValue ? WORKINGYEAR.Value : 0);
if (modelApproveRole != null)
modelUser.APPROVE_ROLE_ID = modelApproveRole.ID;
if (isAddUser == true)
{
modelUser.PERSON_ID = Guid.NewGuid();//先生成T_FM_PERSON的ID
modelPerson = new T_FM_PERSON();
modelPerson.ID = modelUser.PERSON_ID.Value;
modelPerson.CREATE_TIME = dtNow;
}
modelPerson.ORG_ID = OrgID;
modelPerson.CREATE_TIME = dtNow;
modelPerson.NAME = modelUser.NAME;
modelPerson.CODE = modelUser.CODE;
modelPerson.SEX = modelUser.SEX;
modelPerson.DEPARTMENT_ID = modelUser.DEPARTMENT_ID;
if (modelPost != null)
{
modelPerson.POST_ID = modelPost.ID;
}
listUSER.Add(modelUser);
listPerson.Add(modelPerson);
//}
if (listRoleItem != null && listRoleItem.Count > 0)
{
foreach (var item in listRoleItem)
{
if (!isAddUser)
{
modelUserRole = listUserRole.FirstOrDefault(e => e.USER_ID == modelUser.ID && e.BELONG_ROLE_ID == item.ID);
}
if (modelUserRole == null)
modelUserRole = new T_FM_USER_BELONG_ROLE();
modelUserRole.ID = Guid.NewGuid();
modelUserRole.ORG_ID = OrgID;
modelUserRole.USER_ID = modelUser.ID;
modelUserRole.BELONG_ROLE_ID = item.ID;
modelUserRole.CREATE_TIME = dtNow;
listUserRoleAdd.Add(modelUserRole);
listUserRole.Add(modelUserRole);
}
modelUserRole = null;
}
//姓名 工号不能变 都添加
listUserAdd.Add(modelUser);
listPersonAdd.Add(modelPerson);
}
#endregion
}
#endregion
}
#endregion
#region 提示 行：1，列：2、3、4；行：2，列：1 不能为空、。。。！
string strEmptyError = string.Empty;
if (dicIndexEmpty.Count > 0)
{
int colIndex = 0;
foreach (var item in dicIndexEmpty)
{
strEmptyError += "行：" + item.Key + "，列：";
colIndex = 0;
foreach (var itemVal in item.Value)
{
strEmptyError += (colIndex > 0 ? "、" : "") + itemVal;
colIndex++;
}
strEmptyError += "；";
}
strEmptyError = strEmptyError.Substring(0, strEmptyError.Length - 1) + "不能为空！";
}
string strDepartment10Error = string.Empty;
if (listDepartment10Index != null && listDepartment10Index.Count > 0)
{
strDepartment10Error = "部门名称层级异常：" + string.Join(",", listDepName10) + "，行：" + string.Join(',', listDepartment10Index);
}
string strDepartment15Error = string.Empty;
if (listDepartment15Index != null && listDepartment15Index.Count > 0)
{
strDepartment15Error = "车间名称层级异常：" + string.Join(",", listDepName15) + "，行：" + string.Join(',', listDepartment15Index);
}
string strDepartment13Error = string.Empty;
if (listDepartment13Index != null && listDepartment13Index.Count > 0)
{
strDepartment13Error = "组织数据异常：有车间名称没有部门名称，行：" + string.Join(',', listDepartment13Index);
}
string strDepartment35Error = string.Empty;
if (listDepartment35Index != null && listDepartment35Index.Count > 0)
{
strDepartment35Error = "组织数据异常：有班组名称没有车间名称，行：" + string.Join(',', listDepartment35Index);
}
string strPHONEError = string.Empty;
if (listPHONEIndex != null && listPHONEIndex.Count > 0)
{
strPHONEError = "手机号码格式错误：" + string.Join(",", listStrPHONE) + "，行：" + string.Join(',', listPHONEIndex);
}
string strID_CARDError = string.Empty;
if (listID_CARDIndex != null && listID_CARDIndex.Count > 0)
{
strPHONEError = "身份证号格式错误：" + string.Join(",", strID_CARDError) + "，行：" + string.Join(',', listID_CARDIndex);
}
string strSEXError = string.Empty;
if (listSEXIndex != null && listSEXIndex.Count > 0)
{
strSEXError = "性别错误，只能【男/女】：" + string.Join(",", listStrSEX) + "，行：" + string.Join(',', listSEXIndex);
}
string strENTRYTIMEError = string.Empty;
if (listENTRYTIMEIndex != null && listENTRYTIMEIndex.Count > 0)
{
strENTRYTIMEError = "入职日期：" + string.Join(",", listStrENTRYTIME) + "，行：" + string.Join(',', listENTRYTIMEIndex);
}
string strWORKINGYEARError = string.Empty;
if (listWORKINGYEARIndex != null && listWORKINGYEARIndex.Count > 0)
{
strWORKINGYEARError = "工龄：" + string.Join(",", listStrENTRYTIME) + "，行：" + string.Join(',', listWORKINGYEARIndex);
}
if (!string.IsNullOrEmpty(strEmptyError))
{
Msg += strEmptyError;
}
if (!string.IsNullOrEmpty(strDepartment10Error))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strDepartment10Error;
}
if (!string.IsNullOrEmpty(strDepartment15Error))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strDepartment15Error;
}
if (!string.IsNullOrEmpty(strDepartment13Error))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strDepartment13Error;
}
if (!string.IsNullOrEmpty(strDepartment35Error))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strDepartment35Error;
}
if (!string.IsNullOrEmpty(strPHONEError))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strPHONEError;
}
if (!string.IsNullOrEmpty(strID_CARDError))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strID_CARDError;
}
if (!string.IsNullOrEmpty(strSEXError))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strSEXError;
}
if (!string.IsNullOrEmpty(strENTRYTIMEError))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strENTRYTIMEError;
}
if (!string.IsNullOrEmpty(strWORKINGYEARError))
{
Msg += (Msg.Length > 0 ? "；\r\n" : "") + strWORKINGYEARError;
}
if (!string.IsNullOrEmpty(Msg))
{
throw new Exception(Msg);
}
#endregion
this.UnifiedCommit(() =>
{
if (listDepAdd != null && listDepAdd.Any())
BantchSaveEntityNoCommit(listDepAdd);
if (listPersonAdd != null && listPersonAdd.Any())
BantchSaveEntityNoCommit(listPersonAdd);
if (listUserAdd != null && listUserAdd.Any())
BantchSaveEntityNoCommit(listUserAdd);
if (listUserPostAdd != null && listUserPostAdd.Any())
BantchSaveEntityNoCommit(listUserPostAdd);
if (listApproveRoleAdd != null && listApproveRoleAdd.Any())
BantchSaveEntityNoCommit(listApproveRoleAdd);
if (listUserRoleAdd != null && listUserRoleAdd.Any())
BantchSaveEntityNoCommit(listUserRoleAdd);
});
#region 总部
if (isHead)
{
//除了总部 每个子公司都添加 人员信息
//depID 变成公司的
//人员的岗位ID变成null
string conn = string.Empty;
List<string> listConn = new List<string>();
using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"]))
{
List<Guid> listConnID = context.GetEntities<T_OP_TENANT>(e => e.DB_CONN_ID.HasValue && e.CODE != telnetCode, null, null).Select(e => e.DB_CONN_ID.Value).ToList();
var listDbConn = context.GetEntities<T_OP_TENANT_DB_CONN>(e => listConnID.Contains(e.ID), null, null);
foreach (var item in listDbConn)
{
conn = item.DB_CONN;
if (ConfigurationManager.AppSettings["Env"] == ((int)EnvType.外网).ToString())
{
conn = item.DB_CONN_WAN;
}
if (!string.IsNullOrEmpty(conn) && !listConn.Contains(conn))
{
listConn.Add(conn);
}
}
}
foreach (var itemConn in listConn)
{
using (var context = new MigrationContext(itemConn))
{
var depCompay = context.GetEntity<T_FM_DEPARTMENT>(e => e.DEPARTMENT_TYPE == (int)FMDepartmentType.Company && e.ENABLE_STATUS == 0 && !e.IS_DELETED, new string[] { "ID", "ORG_ID", "CREATER_ID" }, null);
if (depCompay.ID != Guid.Empty)
{
foreach (var item in listPersonAdd)
{
item.POST_ID = null;
item.DEPARTMENT_ID = depCompay.ID;
item.CREATER_ID = depCompay.CREATER_ID;
item.ORG_ID = depCompay.ORG_ID;
item.POST_ID = null;
}
foreach (var item in listUserAdd)
{
item.DEPARTMENT_ID = depCompay.ID;
item.CREATER_ID = depCompay.CREATER_ID;
item.ORG_ID = depCompay.ORG_ID;
item.APPROVE_ROLE_ID = null;
}
try
{
context.AddEntities(listPersonAdd);
context.AddEntities(listUserAdd);
context.SaveChanges();
}
catch (Exception ex)
{
}
}
}
}
}
#endregion
Msg = "导入成功！\r\n用户信息：" + listUserAdd.Count + "条" + (listDepAdd.Count > 0 ? ("、组织信息：" + listDepAdd.Count + "条") : "") + (listUserPostAdd.Count > 0 ? ("、岗位信息：" + listUserPostAdd.Count + "条") : "") + (listApproveRoleAdd.Count > 0 ? ("、审批角色信息：" + listApproveRoleAdd.Count + "条") : "") + "！";
return true;
}
#endregion
}
}

2
APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
View File

@ -236,7 +236,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
pageFilter.Include.Add("Nav_AfterUsers");
pageFilter.Include.Add("Nav_Team");
pageFilter.Limit = 10;
if (tempDep!=null&& tempDep.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (tempDep!=null&& tempDep.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
currDep = (Guid)tempDep.PARENT_ID;
}

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

@ -904,7 +904,7 @@ namespace APT.FO.WebApi.Controllers
}
else
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
var approveIds = users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t => t.ID).ToList();
if (approveIds.Count() == 0)
@ -958,7 +958,7 @@ namespace APT.FO.WebApi.Controllers
var userTemp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (userTemp == null)
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
{
if (charge != null)
{
@ -1020,7 +1020,7 @@ namespace APT.FO.WebApi.Controllers
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
if (chargeSafe != null)
{
@ -1082,7 +1082,7 @@ namespace APT.FO.WebApi.Controllers
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
{
if (chargeK != null)
{
@ -1144,7 +1144,7 @@ namespace APT.FO.WebApi.Controllers
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间安全员")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间安全员")
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp != null)
@ -1629,7 +1629,7 @@ namespace APT.FO.WebApi.Controllers
private void GetDepartmentId(Guid? departmentId,ref Guid? chargeId)
{
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == departmentId);
if (department.DEPARTMENT_TYPE != (int)FMDepartmentType.部门)
if (department.DEPARTMENT_TYPE != (int)FMDepartmentType.Department)
{
GetDepartmentId(department.PARENT_ID,ref chargeId);
return;
@ -1764,11 +1764,11 @@ namespace APT.FO.WebApi.Controllers
public T_FM_DEPARTMENT GetDEPARTMENTLevel(List<T_FM_DEPARTMENT> departList, Guid DepartmentID)
{
var department = departList.FirstOrDefault(t => t.ID == DepartmentID);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
return department;
}

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

@ -614,7 +614,7 @@ namespace APT.FO.WebApi.Controllers
}
else
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
var approveIds = users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t => t.ID).ToList();
if (approveIds.Count() == 0)
@ -668,7 +668,7 @@ namespace APT.FO.WebApi.Controllers
var userTemp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (userTemp == null)
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
{
if (charge != null)
{
@ -730,7 +730,7 @@ namespace APT.FO.WebApi.Controllers
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
if (chargeSafe != null)
{
@ -792,7 +792,7 @@ namespace APT.FO.WebApi.Controllers
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间负责人")
{
if (chargeK != null)
{
@ -854,7 +854,7 @@ namespace APT.FO.WebApi.Controllers
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间安全员")
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "车间安全员")
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp != null)
@ -1054,11 +1054,11 @@ namespace APT.FO.WebApi.Controllers
public T_FM_DEPARTMENT GetDEPARTMENTLevel(List<T_FM_DEPARTMENT> departList, Guid DepartmentID)
{
var department = departList.FirstOrDefault(t => t.ID == DepartmentID);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
return department;
}

4
APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs
View File

@ -793,11 +793,11 @@ namespace APT.FO.WebApi.Controllers
public T_FM_DEPARTMENT GetDEPARTMENTLevel(List<T_FM_DEPARTMENT> departList, Guid DepartmentID)
{
var department = departList.FirstOrDefault(t => t.ID == DepartmentID);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
return department;
}

4
APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
View File

@ -790,11 +790,11 @@ namespace APT.FO.WebApi.Controllers
public T_FM_DEPARTMENT GetDEPARTMENTLevel(List<T_FM_DEPARTMENT> departList, Guid DepartmentID)
{
var department = departList.FirstOrDefault(t => t.ID == DepartmentID);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
return department;
}

8
APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs
View File

@ -447,19 +447,19 @@ namespace APT.HM.WebApi.Controllers.Api
{
if (dtSource.Rows[i][17].ToString().Trim() == "公司级")
{
item.LEVEL = FMDepartmentType.公司;
item.LEVEL = FMDepartmentType.Company;
}
else if (dtSource.Rows[i][17].ToString().Trim() == "部门级")
{
item.LEVEL = FMDepartmentType.部门;
item.LEVEL = FMDepartmentType.Department;
}
else if (dtSource.Rows[i][17].ToString().Trim() == "车间级")
{
item.LEVEL = FMDepartmentType.车间;
item.LEVEL = FMDepartmentType.Workshop;
}
else if (dtSource.Rows[i][17].ToString().Trim() == "班组级")
{
item.LEVEL = FMDepartmentType.班组;
item.LEVEL = FMDepartmentType.Class;
}
}
if (!string.IsNullOrEmpty(dtSource.Rows[i][18].ToString().Trim()))//责任单位

2
APT.MicroApi/APT.HM.WebApi/Controllers/Api/FilePublishController.cs
View File

@ -311,7 +311,7 @@ namespace APT.HM.WebApi.Controllers.Api
var departmentIds = entity.Nav_Area.Where(t=>t.DEPARTMENT_ID!=null).Select(x => (Guid)x.DEPARTMENT_ID).Distinct().ToList();
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID), new BaseFilter(entity.ORG_ID));
//先查询选中部门有没有公司级
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.公司).ToList();
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.Company).ToList();
//发给所有人
if (departmentInfos != null && departmentInfos.Any())
{

2
APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
View File

@ -237,7 +237,7 @@ namespace APT.HM.WebApi.Controllers.Api
hazardRecord.INITIATING_DEPARTMENT = entity.INITIATING_DEPARTMENT;
hazardRecord.NOTE_TAKER_ID = userID;
hazardRecord.STATUS = (int)FOPreMeetingStatusEnum.草稿;
hazardRecord.LEVEL = FMDepartmentType.部门;
hazardRecord.LEVEL = FMDepartmentType.Department;
hazardRecord.START_TIME = entity.START_TIME;
hazardRecord.END_TIME = entity.END_TIME;
hazardRecord.ORG_ID = orgId;

6
APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs
View File

@ -463,7 +463,7 @@ namespace APT.HM.WebApi.Controllers.Api
//创建人部门层级
var department = this.GetEntity<T_FM_USER>(t=>t.ID == identity.CREATER_ID && t.ENABLE_STATUS == 0, "Nav_Department");
//默认为班组
int departmentType = (int)FMDepartmentType.班组;
int departmentType = (int)FMDepartmentType.Class;
if (department != null && department.Nav_Department != null)
{
departmentType = department.Nav_Department.DEPARTMENT_TYPE;
@ -631,7 +631,7 @@ namespace APT.HM.WebApi.Controllers.Api
var chargeId = id;
//var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var user = GetEntity<T_FM_USER>(t => t.ID == id && t.ENABLE_STATUS == 0, false, "Nav_Department");
if (user.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
if (user.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
chargeId = user.Nav_Department.USER_ID;
}
@ -829,7 +829,7 @@ namespace APT.HM.WebApi.Controllers.Api
{
var result = new Guid?();
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == departmentId);
if (department.DEPARTMENT_TYPE != (int)FMDepartmentType.部门)
if (department.DEPARTMENT_TYPE != (int)FMDepartmentType.Department)
{
GetDepartmentId(department.PARENT_ID);
}

2
APT.MicroApi/APT.HM.WebApi/Controllers/Api/NoticeReleaseController.cs
View File

@ -403,7 +403,7 @@ namespace APT.HM.WebApi.Controllers.Api
{
var allUsers = new List<Guid>();
var departments = GetEntities<T_FM_DEPARTMENT>(t => departmentIDs.Contains(t.ID), new BaseFilter(orgId));
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.公司).ToList();
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.Company).ToList();
if (departmentInfos != null && departmentInfos.Any())
{
var allUsers1 = GetEntities<T_FM_USER>(i => i.ENABLE_STATUS == 0, new BaseFilter(orgId)).Select(t => t.ID).Distinct().ToList();

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

@ -2716,7 +2716,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2757,7 +2757,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.车间;
sum.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2781,7 +2781,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.班组;
sum.DEPARTMENT_TYPE = FMDepartmentType.Class;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2805,7 +2805,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2846,7 +2846,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.车间;
sum.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2870,7 +2870,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.班组;
sum.DEPARTMENT_TYPE = FMDepartmentType.Class;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2894,7 +2894,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2935,7 +2935,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.车间;
sum.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2959,7 +2959,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.班组;
sum.DEPARTMENT_TYPE = FMDepartmentType.Class;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -2983,7 +2983,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -3024,7 +3024,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.车间;
sum.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -3048,7 +3048,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.班组;
sum.DEPARTMENT_TYPE = FMDepartmentType.Class;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -3072,7 +3072,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -3113,7 +3113,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.车间;
sum.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -3137,7 +3137,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
sum.FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.班组;
sum.DEPARTMENT_TYPE = FMDepartmentType.Class;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;

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

@ -195,7 +195,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
}
catch
{
model.DEPARTMENT_TYPE = FMDepartmentType.部门;
model.DEPARTMENT_TYPE = FMDepartmentType.Department;
}
}
model.COUNT = 0;
@ -257,7 +257,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
catch { }
try
{
riskCount.DEPARTMENT_TYPE = FMDepartmentType.部门;
riskCount.DEPARTMENT_TYPE = FMDepartmentType.Department;
}
catch { }
riskCount.DEPARTMENT_ID = item.Key.ID;
@ -318,7 +318,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
var riskTop = new T_BI_HRISK_TOP();
riskTop.ID = Guid.NewGuid();
riskTop.ORG_ID = filter.OrgId;
riskTop.DEPARTMENT_TYPE = FMDepartmentType.公司;
riskTop.DEPARTMENT_TYPE = FMDepartmentType.Company;
riskTop.DEPARTMENT_ID = Guid.Empty;
riskTop.MAINID = Guid.Empty;

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

@ -504,11 +504,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{
//var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == id);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
return department;
}
@ -1063,7 +1063,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
risk2.ORG_ID = filter.GetOrgId();
risk2s.Add(risk2);
}
var chejians = risk2s.Where(t => t.DEPARTMENT_TYPE == FMDepartmentType.车间);
var chejians = risk2s.Where(t => t.DEPARTMENT_TYPE == FMDepartmentType.Workshop);
foreach (EvaluateLevelEnum level in Enum.GetValues(typeof(EvaluateLevelEnum)))
{
foreach (int unit in Enum.GetValues(typeof(FMProductionUnit)))
@ -1536,7 +1536,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
}
perCount = listContentReason.Where(e => e.RISK_REASON_ID == perReasonID && e.Nav_RiskSubmitContent != null && e.Nav_RiskSubmitContent.DEPARTMENT_ID.HasValue && e.Nav_RiskSubmitContent.DEPARTMENT_ID.Value == itemD.ID).Count();
reason.DEPARTMENT_TYPE = FMDepartmentType.班组;
reason.DEPARTMENT_TYPE = FMDepartmentType.Class;
reason.NUMD = depNum;
reason.COUNT = perCount;
reason.CODE = CODE;
@ -1577,7 +1577,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
}
}
}
reason.DEPARTMENT_TYPE = FMDepartmentType.车间;
reason.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
reason.NUMD = depNum;
reason.COUNT = perCount + perSubCount;
reason.CODE = CODE;
@ -1618,7 +1618,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
}
}
}
reason.DEPARTMENT_TYPE = FMDepartmentType.部门;
reason.DEPARTMENT_TYPE = FMDepartmentType.Department;
reason.NUMD = depNum;
reason.COUNT = perCount + perSubCount;
reason.CODE = CODE;
@ -1643,7 +1643,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
perCount = listContentReason.Where(e => e.RISK_REASON_ID == perReasonID).Count();//e.Nav_RiskSubmitContent.DEPARTMENT_ID.Value == itemD.ID &&
reason.DEPARTMENT_TYPE = FMDepartmentType.公司;
reason.DEPARTMENT_TYPE = FMDepartmentType.Company;
reason.NUMD = depNum;
reason.COUNT = perCount;
reason.CODE = CODE;
@ -1827,7 +1827,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
listResult.Add(perME);//地址引用 应该是支持
}
perCount = dtSubmitContent.Where(e => e.ISFINISHINTTIME.HasValue && !e.ISFINISHINTTIME.Value && e.DEPARTMENT_ID.Value == itemD.ID && e.CREATE_TIME.HasValue && e.CREATE_TIME.Value.Year == listYear[j] && e.CREATE_TIME.Value.Month == listMonth[j]).Count();//某组织 年 月 按时整改隐患
perME.DEPARTMENT_TYPE = FMDepartmentType.班组;
perME.DEPARTMENT_TYPE = FMDepartmentType.Class;
perME.NUMD = depNum;
perME.COUNT = perCount;
perME.CODE = CODE;
@ -1849,7 +1849,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
perCountNot = listCheck.Where(e => !e.IS_DELETED && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == itemD.ID && e.CREATE_TIME.HasValue && e.CREATE_TIME.Value.Year == listYear[j] && e.CREATE_TIME.Value.Month == listMonth[j]).Count();
}
perME.DEPARTMENT_TYPE = FMDepartmentType.班组;
perME.DEPARTMENT_TYPE = FMDepartmentType.Class;
perME.NUMD = depNum;
perME.COUNT = perCount + perCountNot;
perME.CODE = CODE;

20
APT.MicroApi/APT.PP.WebApi/Controllers/Api/HMController.cs
View File

@ -94,7 +94,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
List<T_HM_EVALUATION_DETAIL> riskEvaluationDetails = new List<T_HM_EVALUATION_DETAIL>();
List<T_HM_EVALUATION_DETAIL_IDENTIFYING> riskEvaluationDetailIdentifyings = new List<T_HM_EVALUATION_DETAIL_IDENTIFYING>();
List<T_HM_EVALUATION_DETAIL_AREA> riskEvaluationDetailAreas = new List<T_HM_EVALUATION_DETAIL_AREA>();
var allDeps = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.部门, new BaseFilter(orgId));//查出所有部门级
var allDeps = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.Department, new BaseFilter(orgId));//查出所有部门级
var DBfilter = new BaseFilter(orgId);
DBfilter.SelectField = new string[] { "AREA_ID", "LEVEL", "DEPARTMENT_LIABLE_ID", "IDENTIFYING_ID" };
var riskDB = GetEntities<T_HM_EVALUATE_RISK>(t => t.STATUS == 0 && t.DEPARTMENT_LIABLE_ID != null, DBfilter);
@ -112,7 +112,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
RiskEvaluationDetail1.ORG_ID = orgId;
RiskEvaluationDetail1.PLAN_ID = plan.ID;
RiskEvaluationDetail1.RISK_TYPE = HMRiskTypeEnmu.危险源辨识;
if (dep.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (dep.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
RiskEvaluationDetail1.CHARGE_USER_ID = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "安环部负责人").ID; ;
}
@ -127,21 +127,21 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var levels = "_";
foreach (var db in allLevels)
{
if (db == FMDepartmentType.公司)
if (db == FMDepartmentType.Company)
{
levels += "3_";
levels += "5_";
}
else if (db == FMDepartmentType.部门)
else if (db == FMDepartmentType.Department)
{
levels += "0_";
levels += "10_";
}
else if (db == FMDepartmentType.车间)
else if (db == FMDepartmentType.Workshop)
{
levels += "1_";
levels += "15_";
}
else if (db == FMDepartmentType.班组)
else if (db == FMDepartmentType.Class)
{
levels += "2_";
levels += "20_";
}
}
if (levels != "_")

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

@ -257,16 +257,16 @@ namespace APT.PP.WebApi.Controllers.Api
var departType = -1;
switch (item.DEPARTMENT_TYPE)
{
case FMDepartmentType.公司:
case FMDepartmentType.Company:
departType = 0;
break;
case FMDepartmentType.部门:
case FMDepartmentType.Department:
departType = 1;
break;
case FMDepartmentType.车间:
case FMDepartmentType.Workshop:
departType = 2;
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
departType = -1;
break;
default:
@ -461,7 +461,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
if (isSend)
{
if (set.DEPARTMENT_TYPE == FMDepartmentType.公司)
if (set.DEPARTMENT_TYPE == FMDepartmentType.Company)
{
var depart = departments.FirstOrDefault(t => t.NAME.Contains("安全环保") && t.DEPARTMENT_TYPE != 1 && t.DEPARTMENT_TYPE != 2);
if (depart != null)
@ -480,7 +480,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
else if (set.DEPARTMENT_TYPE == FMDepartmentType.班组)
else if (set.DEPARTMENT_TYPE == FMDepartmentType.Class)
{
var departList = departments.Where(t => t.DEPARTMENT_TYPE == 2).ToList();
if (departList.Any())

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

@ -53,7 +53,7 @@ namespace APT.PP.WebApi.Controllers
baseFilter.Level = -1;
baseFilter.IsParentData = false;
baseFilter.SelectField = new string[] { "ID" };
var workShops = this.GetEntities<T_FM_DEPARTMENT>(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.车间, baseFilter);
var workShops = this.GetEntities<T_FM_DEPARTMENT>(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop, baseFilter);
string[] Day = new string[] { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" };
foreach (var nodelModel in workShops)
{

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

@ -407,7 +407,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
modelRun.LEVELVALUE = listDepartment[j].DEPARTMENT_TYPE;
if (modelRun.MEETINGTYPE == SCMEETINGTYPE.SafetyBoard)
{
modelRun.LEVELVALUE = (int)FMDepartmentType.公司;
modelRun.LEVELVALUE = (int)FMDepartmentType.Company;
}
modelRun.DEPARTMENT_ID = listDepartment[j].ID;//检查部门（公司/部门/车间/班组 ID）
modelRun.CREATE_TIME = dtNow;
@ -1227,7 +1227,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
listMTFA = listMT.Where(e => e.MEETINGTYPE == SCMEETINGTYPE.Ordinary && e.CREACTTYPE == CREACTTYPEEnum.ToHM104);
if (listMTFA != null && listMTFA.Any())
{
var deps = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_STATUS == 0 && e.USER_ID.HasValue && e.DEPARTMENT_TYPE == (int)FMDepartmentType.部门, null, null);
var deps = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_STATUS == 0 && e.USER_ID.HasValue && e.DEPARTMENT_TYPE == (int)FMDepartmentType.Department, null, null);
var listUsers = deps.Select(e => e.USER_ID.Value);
var listUser = GetEntities<T_FM_USER>(e => listUsers.Contains(e.ID), null, null);
List<Guid> listUserIDdep = new List<Guid>();
@ -1343,7 +1343,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
listMTFA = listMT.Where(e => e.MEETINGTYPE == SCMEETINGTYPE.Ordinary && e.CREACTTYPE == CREACTTYPEEnum.ToOG028);
if (listMTFA != null && listMTFA.Any())
{
var depSafe = GetEntity<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && e.DEPARTMENT_STATUS == (int)FMDepartmentStatus.安全部门);
var depSafe = GetEntity<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.DEPARTMENT_TYPE == (int)FMDepartmentType.Department && e.DEPARTMENT_STATUS == (int)FMDepartmentStatus.安全部门);
if (depSafe != null)
{
var role = GetEntity<T_PF_APPROVAL_ROLE>(e => e.NAME.Contains("安环部安全员"));
@ -1495,7 +1495,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{
//尾矿库部门负责人
var wkEnum = GetEntity<T_FM_ENUMS>(e => e.CODE == "BSMineTypeEnum" && e.VALUE == 20);
var listDep = GetEntities<T_FM_DEPARTMENT_PRODUCTION_UNIT>(e => e.ENUMS_ID == wkEnum.ID && e.Nav_Department.USER_ID.HasValue && e.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门, null, "Nav_Department");
var listDep = GetEntities<T_FM_DEPARTMENT_PRODUCTION_UNIT>(e => e.ENUMS_ID == wkEnum.ID && e.Nav_Department.USER_ID.HasValue && e.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department, null, "Nav_Department");
if (listDep != null && listDep.Any())
{
var listUserID = listDep.Select(e => e.Nav_Department.USER_ID.Value);
@ -1893,7 +1893,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
entityMT.ID = Guid.NewGuid();
entityMT.MEETINGTYPE = SCMEETINGTYPE.Ordinary;
entityMT.DEPARTMENT_ID = userSafeMaster.DEPARTMENT_ID.Value;
entityMT.LEVELVALUE = (int)FMDepartmentType.部门;
entityMT.LEVELVALUE = (int)FMDepartmentType.Department;
entityMT.ORG_ID = item.ORG_ID;
entityMT.USER_ID_ORIGINATOR = userSafeMaster.ID;
entityMT.STATUS = PFStandardStatus.Draft;

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

@ -1006,7 +1006,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
List<T_SE_SAFE_SURVEY> safeSurveys = new List<T_SE_SAFE_SURVEY>();
List<T_SE_SAFE_SURVEY_LIST_DEPARTMENT> safeSurveyDeps = new List<T_SE_SAFE_SURVEY_LIST_DEPARTMENT>();
var depIds = depPostList.Select(t => t.DEPARTMENT_ID);
var allDep = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE != (int)FMDepartmentType.班组, new BaseFilter(filter.GetOrgId()));
var allDep = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE != (int)FMDepartmentType.Class, new BaseFilter(filter.GetOrgId()));
List<T_FM_DEPARTMENT> selectDeps = new List<T_FM_DEPARTMENT>();
foreach (var d in depPostList)
{
@ -1023,7 +1023,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
};
if (safeDeps.Contains(d.Nav_Department.NAME))
{
selectDeps = allDep.Where(t => !workDeps.Contains(t.NAME) && t.DEPARTMENT_TYPE == (int)FMDepartmentType.部门).ToList();
selectDeps = allDep.Where(t => !workDeps.Contains(t.NAME) && t.DEPARTMENT_TYPE == (int)FMDepartmentType.Department).ToList();
}
else
{
@ -1143,7 +1143,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
List<T_SE_TRAIN_SURVEY> sendTrains = new List<T_SE_TRAIN_SURVEY>();
List<T_SE_TRAIN_SURVEY_LIST_DEPARTMENT> safeSurveyDeps = new List<T_SE_TRAIN_SURVEY_LIST_DEPARTMENT>();
var depIds = depPostList.Select(t => t.DEPARTMENT_ID);
var allDep = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE != (int)FMDepartmentType.班组, new BaseFilter(filter.GetOrgId()));
var allDep = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE != (int)FMDepartmentType.Class, new BaseFilter(filter.GetOrgId()));
List<T_FM_DEPARTMENT> selectDeps = new List<T_FM_DEPARTMENT>();
foreach (var d in depPostList)
{
@ -1161,7 +1161,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
};
if (safeDeps.Contains(d.Nav_Department.NAME))
{
selectDeps = allDep.Where(t => !workDeps.Contains(t.NAME) && t.DEPARTMENT_TYPE == (int)FMDepartmentType.部门).ToList();
selectDeps = allDep.Where(t => !workDeps.Contains(t.NAME) && t.DEPARTMENT_TYPE == (int)FMDepartmentType.Department).ToList();
}
else
{

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

@ -134,15 +134,15 @@ namespace APT.SC.WebApi.Controllers.Api.BI
var all = GetEntities<T_HM_EVALUATE_RISK>(t => t.STATUS == (int)HMOperationStepEnum.有效 && t.DEPARTMENT_LIABLE_ID != null && t.SOURCE_DEPARTMENT_ID == null, riskFilter);
foreach (var entity in all)
{
if (entity.Nav_DepartmentLiable.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (entity.Nav_DepartmentLiable.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
entity.SOURCE_DEPARTMENT_ID = entity.Nav_DepartmentLiable.Nav_Parent.Nav_Parent.ID;
}
if (entity.Nav_DepartmentLiable.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
if (entity.Nav_DepartmentLiable.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
entity.SOURCE_DEPARTMENT_ID = entity.Nav_DepartmentLiable.Nav_Parent.ID;
}
if (entity.Nav_DepartmentLiable.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
if (entity.Nav_DepartmentLiable.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
entity.SOURCE_DEPARTMENT_ID = entity.DEPARTMENT_LIABLE_ID;
}

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

@ -239,11 +239,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{
//var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == id);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
return department;
}
@ -262,11 +262,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
public T_FM_DEPARTMENT GetDEPARTMENTLevel(List<T_FM_DEPARTMENT> departList, Guid DepartmentID)
{
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == DepartmentID);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
return department;
}
@ -284,11 +284,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
public T_FM_DEPARTMENT GetDEPARTMENTShop(List<T_FM_DEPARTMENT> departList, Guid DepartmentID)
{
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == DepartmentID);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 || department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department || department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
return department;
}
@ -306,11 +306,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
public T_FM_DEPARTMENT GetDEPARTMENTClass(List<T_FM_DEPARTMENT> departList, Guid DepartmentID)
{
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == DepartmentID);
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 || department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 || department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop || department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department || department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
return null;
}
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
return department;
}
@ -9224,7 +9224,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -9248,7 +9248,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
sum.FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.车间;
sum.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -9272,7 +9272,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
sum.FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.班组;
sum.DEPARTMENT_TYPE = FMDepartmentType.Class;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -9342,7 +9342,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 0).Count();
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -9366,7 +9366,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
sum.FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = t.Where(m => m.SHOP_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 0).Count();
sum.DEPARTMENT_TYPE = FMDepartmentType.车间;
sum.DEPARTMENT_TYPE = FMDepartmentType.Workshop;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -9390,7 +9390,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
sum.FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 1).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 2).Count();
sum.UNFINISH_QTY = t.Where(m => m.CLASS_DEPARTMENT_ID == t.Key.Value && m.NOTICE_STATUS == 0).Count();
sum.DEPARTMENT_TYPE = FMDepartmentType.班组;
sum.DEPARTMENT_TYPE = FMDepartmentType.Class;
var temp = sum.TOTAL_QTY == 0 ? 0 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0");
var temp2 = sum.TOTAL_QTY == 0 ? 0 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;
@ -10536,7 +10536,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
sum.FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && (m.NOTICE_STATUS == 1 || m.NOTICE_STATUS == 3 || m.NOTICE_STATUS == 9)).Count();
sum.OVER_FINISH_QTY = t.Where(m => m.DEPT_DEPARTMENT_ID == t.Key.Value && (m.NOTICE_STATUS == 2 || m.NOTICE_STATUS == 4)).Count();
sum.UNFINISH_QTY = sum.TOTAL_QTY - sum.FINISH_QTY - sum.OVER_FINISH_QTY;
sum.DEPARTMENT_TYPE = FMDepartmentType.部门;
sum.DEPARTMENT_TYPE = FMDepartmentType.Department;
var temp = sum.TOTAL_QTY == 0 ? 100 : (double)(sum.FINISH_QTY + sum.OVER_FINISH_QTY) / sum.TOTAL_QTY * 100;
sum.FINISH_RATE = temp.ToString("0.00");
var temp2 = sum.TOTAL_QTY == 0 ? 100 : (double)sum.FINISH_QTY / sum.TOTAL_QTY * 100;

18
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/02OGSafePdtAssessPlanCheckController.cs
View File

@ -216,22 +216,22 @@ namespace APT.SC.WebApi.Controllers.Api.OG
T_OG_SAFE_PDT_ASSESS_PLAN_CHECK auditDepart = null;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUser = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId.Value, "Nav_Department", "Nav_ApproveRole");
var name = ""; var type = 0; var departmentType = FMDepartmentType.公司;
var name = ""; var type = 0; var departmentType = FMDepartmentType.Company;
switch (audit.LEVEL)
{
case FMDepartmentType.公司:
departmentType = FMDepartmentType.部门;
case FMDepartmentType.Company:
departmentType = FMDepartmentType.Department;
name = "部门"; type = 1;
break;
case FMDepartmentType.部门:
departmentType = FMDepartmentType.车间;
case FMDepartmentType.Department:
departmentType = FMDepartmentType.Workshop;
name = "车间"; type = 2;
break;
case FMDepartmentType.车间:
departmentType = FMDepartmentType.班组;
case FMDepartmentType.Workshop:
departmentType = FMDepartmentType.Class;
name = "班组";
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
name = "";
break;
default:
@ -241,7 +241,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
List<T_OG_SAFE_PDT_ASSESS_PLAN_CHECK_DETAIL> auditDetails = new List<T_OG_SAFE_PDT_ASSESS_PLAN_CHECK_DETAIL>();
List<T_OG_SAFE_PDT_ASSESS_PLAN_CHECK_DETAIL_CONTENT> contents = new List<T_OG_SAFE_PDT_ASSESS_PLAN_CHECK_DETAIL_CONTENT>();
T_FM_NOTIFICATION_TASK notice = null;
if ((int)audit.LEVEL != loginUser.Nav_Department.DEPARTMENT_TYPE || ((int)audit.LEVEL == loginUser.Nav_Department.DEPARTMENT_TYPE && audit.LEVEL == FMDepartmentType.班组))
if ((int)audit.LEVEL != loginUser.Nav_Department.DEPARTMENT_TYPE || ((int)audit.LEVEL == loginUser.Nav_Department.DEPARTMENT_TYPE && audit.LEVEL == FMDepartmentType.Class))
{
if (name == "")
{

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/05OGAgencyController.cs
View File

@ -37,7 +37,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
[HttpPost, Route("OrderPagedWithOutClassDep")]
public JsonActionResult<List<T_OG_AGENCY>> OrderPagedWithOutClassDep([FromBody] KeywordPageFilter pageFilter)
{
var list = GetEntities<T_OG_AGENCY>(t => t.LEVEL == FMDepartmentType.公司 || t.LEVEL == FMDepartmentType.部门 || t.LEVEL == FMDepartmentType.车间, new BaseFilter()).ToList();
var list = GetEntities<T_OG_AGENCY>(t => t.LEVEL == FMDepartmentType.Company || t.LEVEL == FMDepartmentType.Department || t.LEVEL == FMDepartmentType.Workshop, new BaseFilter()).ToList();
JsonActionResult<List<T_OG_AGENCY>> result = new JsonActionResult<List<T_OG_AGENCY>>();
result.Data = list.OrderBy(t => t.LEVEL).ToList();

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/09OGEmployeeRefuseItemReportController.cs
View File

@ -85,7 +85,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
}
else
{
if(isNormal.Nav_Department.DEPARTMENT_TYPE==(int)FMDepartmentType.部门)
if(isNormal.Nav_Department.DEPARTMENT_TYPE==(int)FMDepartmentType.Department)
{
var fuzong = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "分管安全副总");
if (fuzong != null)

8
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/16OGApproveRewardPunishmentReportController.cs
View File

@ -89,7 +89,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
{
var AHUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "安环部负责人");
var department = GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.DEPARTMENT_ID, new string[] { "Nav_User" });
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.Company)
{
entity.STATUS = PFStandardStatus.Archived;
}
@ -100,7 +100,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
string type = "";
switch (department.DEPARTMENT_TYPE)
{
case (int)FMDepartmentType.部门:
case (int)FMDepartmentType.Department:
// 安环部
if (department.ID == AHUser.DEPARTMENT_ID)
{
@ -111,10 +111,10 @@ namespace APT.SC.WebApi.Controllers.Api.OG
type = "BM";
}
break;
case (int)FMDepartmentType.车间:
case (int)FMDepartmentType.Workshop:
type = "CJ";
break;
case (int)FMDepartmentType.班组:
case (int)FMDepartmentType.Class:
type = "BZ";
break;
}

6
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/18OGEventReportController.cs
View File

@ -80,7 +80,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
string sendUserName = "";
if (chargeUser.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (chargeUser.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
var safeUser = GetEntity<T_FM_USER>(t => t.DEPARTMENT_ID == chargeUser.Nav_Department.Nav_Parent.Nav_Parent.ID && t.Nav_ApproveRole.NAME == "部门安全员");
if (safeUser == null)
@ -97,7 +97,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
}
}
else if (chargeUser.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
else if (chargeUser.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
var safeUser = GetEntity<T_FM_USER>(t => t.DEPARTMENT_ID == chargeUser.Nav_Department.Nav_Parent.Nav_Parent.ID && t.Nav_ApproveRole.NAME == "部门安全员");
if (safeUser == null)
@ -113,7 +113,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
sendUserDep = (Guid)safeUser.DEPARTMENT_ID;
}
}
else if (chargeUser.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (chargeUser.Nav_Department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
sendUser = chargeUser.Nav_Department.Nav_Parent.Nav_User.ID;
sendUserName = chargeUser.Nav_Department.Nav_Parent.Nav_User.NAME;

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

@ -49,7 +49,7 @@ namespace APT.SC.WebApi.Controllers.Api.OG
// 每月末触发待办事项给班组长和车间负责人
if (days == currentDay)
{
var deps = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.车间 || t.DEPARTMENT_TYPE == (int)FMDepartmentType.班组,
var deps = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop || t.DEPARTMENT_TYPE == (int)FMDepartmentType.Class,
new BaseFilter(null, FilterOrgTypeEnum.忽略组织), new string[] { "Nav_User" });
var recordList = new List<T_OG_SAFE_ASSESS_RECORD>();
deps.ForEach(dep =>
@ -75,12 +75,12 @@ namespace APT.SC.WebApi.Controllers.Api.OG
//每季度末触发待办事项给部门负责人，安环部负责人
if (endQuarter.DayOfYear == dt.DayOfYear)
{
var deps = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 || t.DEPARTMENT_TYPE == (int)FMDepartmentType.公司,
var deps = GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.Department || t.DEPARTMENT_TYPE == (int)FMDepartmentType.Company,
new BaseFilter(null, FilterOrgTypeEnum.忽略组织), new string[] { "Nav_User" });
var recordList = new List<T_OG_SAFE_ASSESS_RECORD>();
deps.ForEach(dep =>
{
if (dep.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
if (dep.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
T_OG_SAFE_ASSESS_RECORD record = new T_OG_SAFE_ASSESS_RECORD
{

55
APT.MicroApi/APT.SC.WebApi/Controllers/Api/PTController/IndicatorFormulationDepartmentController.cs
View File

@ -52,14 +52,14 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost, Route("FullUpdate")]
public JsonActionResult<bool> FullUpdate([FromBody] T_PT_INDICATOR_FORMULATION_DEPARTMENT entity)
public JsonActionResult<bool> FullUpdate([FromBody] T_PT_INDICATOR_FORMULATION_DEPARTMENT entity)
{
return SafeExecute(() =>
{
var departments = entity.Nav_DepartmentDetail;
if (departments != null && departments.Any())
{
departments= departments.Where(t => !t.IS_DELETED).ToList();
departments = departments.Where(t => !t.IS_DELETED).ToList();
}
var teams = entity.Nav_TeamDetail;
if (teams != null && teams.Any())
@ -199,7 +199,8 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
[HttpPost, Route("IdentityUpdate")]
public JsonActionResult<bool> IdentityUpdate([FromBody] T_PT_INDICATOR_FORMULATION_DEPARTMENT entity)
{
return SafeExecute(() => {
return SafeExecute(() =>
{
var formulationDepartment = this.GetEntity<T_PT_INDICATOR_FORMULATION_DEPARTMENT>(entity.ID);
//发起车间、班组、个人目标与指标
T_PT_INDICATOR_FORMULATION_DEPARTMENT department = null;
@ -213,22 +214,22 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
}
}
var loginUser = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId.Value && t.ENABLE_STATUS == 0, "Nav_Department", "Nav_ApproveRole");
var name = "";var type = 0; var entityDepartment = FMDepartmentType.公司;
var name = ""; var type = 0; var entityDepartment = FMDepartmentType.Company;
switch (formulationDepartment.DEPARTMENT_TYPE)
{
case FMDepartmentType.公司:
entityDepartment = FMDepartmentType.部门;
case FMDepartmentType.Company:
entityDepartment = FMDepartmentType.Department;
name = "车间"; type = 1;
break;
case FMDepartmentType.部门:
entityDepartment = FMDepartmentType.车间;
case FMDepartmentType.Department:
entityDepartment = FMDepartmentType.Workshop;
name = "班组"; type = 2;
break;
case FMDepartmentType.车间:
entityDepartment = FMDepartmentType.班组;
case FMDepartmentType.Workshop:
entityDepartment = FMDepartmentType.Class;
name = "个人";
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
break;
default:
name = "";
@ -244,7 +245,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL> auditDetails = new List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL>();
List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL_CONTENT> contents = new List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL_CONTENT>();
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (((int)formulationDepartment.DEPARTMENT_TYPE != loginUser.Nav_Department.DEPARTMENT_TYPE && loginUser.Nav_ApproveRole != null && loginUser.Nav_ApproveRole.NAME.Contains("负责人"))|| ((int)formulationDepartment.DEPARTMENT_TYPE == loginUser.Nav_Department.DEPARTMENT_TYPE && formulationDepartment.DEPARTMENT_TYPE == FMDepartmentType.班组))
if (((int)formulationDepartment.DEPARTMENT_TYPE != loginUser.Nav_Department.DEPARTMENT_TYPE && loginUser.Nav_ApproveRole != null && loginUser.Nav_ApproveRole.NAME.Contains("负责人")) || ((int)formulationDepartment.DEPARTMENT_TYPE == loginUser.Nav_Department.DEPARTMENT_TYPE && formulationDepartment.DEPARTMENT_TYPE == FMDepartmentType.Class))
{
department = new T_PT_INDICATOR_FORMULATION_DEPARTMENT();
department.STATUS = PFStandardStatus.Draft;
@ -473,14 +474,14 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
}
}
}
//发消息
//var userIds = new List<Guid>();
//userIds.Add(loginUser.ID);
//var userNames = new List<string>();
//var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && userIds.Contains(t.ID));
//userNames.Add(user?.NAME);
T_FM_NOTIFICATION_TASK task = null;
if (entity.TaskID != Guid.Empty)
{
@ -524,7 +525,8 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
[HttpPost, Route("IdentityUpdateYL")]
public JsonActionResult<bool> IdentityUpdateYL([FromBody] T_PT_INDICATOR_FORMULATION_DEPARTMENT entity)
{
return SafeExecute(() => {
return SafeExecute(() =>
{
var formulationDepartment = this.GetEntity<T_PT_INDICATOR_FORMULATION_DEPARTMENT>(entity.ID);
//发起车间、班组、个人目标与指标
T_PT_INDICATOR_FORMULATION_DEPARTMENT department = null;
@ -538,18 +540,18 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
}
}
var loginUser = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId.Value && t.ENABLE_STATUS == 0, "Nav_Department", "Nav_ApproveRole");
var name = ""; var type = 0; var entityDepartment = FMDepartmentType.公司;
var name = ""; var type = 0; var entityDepartment = FMDepartmentType.Company;
switch (formulationDepartment.DEPARTMENT_TYPE)
{
case FMDepartmentType.公司:
entityDepartment = FMDepartmentType.部门;
case FMDepartmentType.Company:
entityDepartment = FMDepartmentType.Department;
name = "班组"; type = 2;
break;
case FMDepartmentType.部门:
entityDepartment = FMDepartmentType.班组;
name = "个人";
case FMDepartmentType.Department:
entityDepartment = FMDepartmentType.Class;
name = "个人";
break;
case FMDepartmentType.班组:
case FMDepartmentType.Class:
break;
default:
name = "";
@ -565,7 +567,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL> auditDetails = new List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL>();
List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL_CONTENT> contents = new List<T_PT_ASSESSMENT_PLAN_AUDIT_DETAIL_CONTENT>();
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (((int)formulationDepartment.DEPARTMENT_TYPE != loginUser.Nav_Department.DEPARTMENT_TYPE && loginUser.Nav_ApproveRole !=null && loginUser.Nav_ApproveRole.NAME.Contains("负责人")) || ((int)formulationDepartment.DEPARTMENT_TYPE == loginUser.Nav_Department.DEPARTMENT_TYPE && formulationDepartment.DEPARTMENT_TYPE == FMDepartmentType.班组))
if (((int)formulationDepartment.DEPARTMENT_TYPE != loginUser.Nav_Department.DEPARTMENT_TYPE && loginUser.Nav_ApproveRole != null && loginUser.Nav_ApproveRole.NAME.Contains("负责人")) || ((int)formulationDepartment.DEPARTMENT_TYPE == loginUser.Nav_Department.DEPARTMENT_TYPE && formulationDepartment.DEPARTMENT_TYPE == FMDepartmentType.Class))
{
department = new T_PT_INDICATOR_FORMULATION_DEPARTMENT();
department.STATUS = PFStandardStatus.Draft;
@ -673,7 +675,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
else
{
//取部门下的所有车间
List<Guid> departmentId = new List<Guid>() {loginUser.DEPARTMENT_ID.Value };
List<Guid> departmentId = new List<Guid>() { loginUser.DEPARTMENT_ID.Value };
List<Guid> departmentIds = new List<Guid>();
DepartmentService.GetDepartmentIds(formulationDepartment.ORG_ID.Value, departmentId, ref departmentIds);
var departInfos = this.GetEntities<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == type && departmentIds.Contains(t.PARENT_ID.Value) && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(formulationDepartment.ORG_ID));
@ -848,7 +850,8 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
[HttpPost, Route("GetEdit")]
public JsonActionResult<T_PT_INDICATOR_FORMULATION_DEPARTMENT> GetEdit([FromBody] KeywordFilter filter)
{
return SafeExecute(() => {
return SafeExecute(() =>
{
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
this.ThrowError("030017");
@ -904,7 +907,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.USER_ID && t.ENABLE_STATUS == 0);
if (user != null)
{
notice = NotificationTaskService.InsertUserNoticeTaskModel(param +"目标与指标已被驳回", entity.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now,
notice = NotificationTaskService.InsertUserNoticeTaskModel(param + "目标与指标已被驳回", entity.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "PT020");
}
UnifiedCommit(() =>

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/PTController/MonitorAssessmentController.cs
View File

@ -259,9 +259,9 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
var parentId = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == monitor.DEPARTMENT_ID.Value)?.PARENT_ID;
if(parentId != null)
chargeUserId = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == parentId)?.USER_ID;
if(monitor.DEPARTMENT_TYPE == FMDepartmentType.部门)
if(monitor.DEPARTMENT_TYPE == FMDepartmentType.Department)
chargeUserId = this.GetEntity<T_FM_USER>(t => t.APPROVE_ROLE_ID != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.ID;
if (monitor.DEPARTMENT_TYPE == FMDepartmentType.公司)
if (monitor.DEPARTMENT_TYPE == FMDepartmentType.Company)
chargeUserId = this.GetEntity<T_FM_USER>(t => t.APPROVE_ROLE_ID != null && t.Nav_ApproveRole.NAME == "总经理" && t.ENABLE_STATUS == 0)?.ID;
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
T_FM_NOTIFICATION_TASK task = null;

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/PTController/SafetyPolicySurveyController.cs
View File

@ -144,7 +144,7 @@ namespace APT.SC.WebApi.Controllers.Api.PTController
var departmentIds = entity.Nav_Ranges.Where(t => t.DEPARTMENT_ID != null).Select(x => (Guid)x.DEPARTMENT_ID).Distinct().ToList();
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID), new BaseFilter(entity.ORG_ID));
//先查询选中部门有没有公司级
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.公司).ToList();
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.Company).ToList();
//发给所有人
if (departmentInfos != null && departmentInfos.Any())
{

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

@ -674,7 +674,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{
var allUsers = new List<Guid>();
var departments = GetEntities<T_FM_DEPARTMENT>(t => departmentIDs.Contains(t.ID), new BaseFilter(orgId));
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.公司).ToList();
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.Company).ToList();
if (departmentInfos != null && departmentInfos.Any())
{
var allUsers1 = GetEntities<T_FM_USER>(i => i.ENABLE_STATUS == 0 && !i.CODE.Contains("admin"), new BaseFilter(orgId)).Select(t => t.ID).Distinct().ToList();

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

@ -283,7 +283,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{
var allUsers = new List<Guid>();
var departments = GetEntities<T_FM_DEPARTMENT>(t => departmentIDs.Contains(t.ID), new BaseFilter(orgId));
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.公司).ToList();
var departmentInfos = departments.Where(x => x.DEPARTMENT_TYPE == (int)FMDepartmentType.Company).ToList();
if (departmentInfos != null && departmentInfos.Any())
{
var allUsers1 = GetEntities<T_FM_USER>(i => i.ENABLE_STATUS == 0 && !i.CODE.Contains("admin"), new BaseFilter(orgId)).Select(t => t.ID).Distinct().ToList();

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

@ -552,17 +552,17 @@ namespace APT.SC.WebApi.Controllers.Api.SE
ORIGINAL_NOTIFY_ID = item.Nav_Notify.ID,
ORG_ID = item.ORG_ID,
};
if (item.Nav_Notify.LEVEL == FMDepartmentType.公司)
if (item.Nav_Notify.LEVEL == FMDepartmentType.Company)
{
newNotify.LEVEL = FMDepartmentType.部门;
newNotify.LEVEL = FMDepartmentType.Department;
}
else if (item.Nav_Notify.LEVEL == FMDepartmentType.部门)
else if (item.Nav_Notify.LEVEL == FMDepartmentType.Department)
{
newNotify.LEVEL = FMDepartmentType.车间;
newNotify.LEVEL = FMDepartmentType.Workshop;
}
else
{
newNotify.LEVEL = FMDepartmentType.班组;
newNotify.LEVEL = FMDepartmentType.Class;
}
transferNotifys.Add(newNotify);
foreach (var rel in Nav_TrainContentList)

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

@ -91,10 +91,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{
if (entity.ORG_ID == Guid.Parse("8b3c41aa-51b1-7ce9-1879-248a038c1b5c"))
{
if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
nextTrainDep = allDepartment.FirstOrDefault(t => t.ID == trainee_department.PARENT_ID); //车间级
if (nextTrainDep.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
if (nextTrainDep.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "车间安全员" && t.DEPARTMENT_ID == nextTrainDep.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });
if (nextTrainUser == null)
@ -103,7 +103,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
}
}
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "车间安全员" && t.DEPARTMENT_ID == trainee_department.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });
if (nextTrainUser == null)
@ -111,7 +111,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "车间负责人" && t.DEPARTMENT_ID == trainee_department.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });
}
}
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "部门安全员" && t.DEPARTMENT_ID == trainee_department.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });
if (nextTrainUser == null)
@ -126,10 +126,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
else
{
if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
nextTrainDep = allDepartment.Where(t => t.ID == trainee_department.PARENT_ID.Value).FirstOrDefault(); //车间级
if (nextTrainDep.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
if (nextTrainDep.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
nextTrainDep = allDepartment.Where(t => t.ID == nextTrainDep.PARENT_ID.Value).FirstOrDefault(); //
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "部门安全员" && t.DEPARTMENT_ID == nextTrainDep.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });
@ -143,7 +143,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
}
}
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.车间)
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.Workshop)
{
nextTrainDep = allDepartment.Where(t => t.ID == trainee_department.PARENT_ID.Value).FirstOrDefault();
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "部门安全员" && t.DEPARTMENT_ID == nextTrainDep.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });
@ -152,7 +152,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "车间安全员" && t.DEPARTMENT_ID == trainee_department.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });
}
}
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
else if (trainee_department.DEPARTMENT_TYPE == (int)FMDepartmentType.Department)
{
nextTrainDep = allDepartment.Where(t => t.ID == trainee_department.ID).FirstOrDefault();
nextTrainUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "部门安全员" && t.DEPARTMENT_ID == nextTrainDep.ID && t.ENABLE_STATUS == 0, new string[] { "Nav_Department" });

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

@ -390,9 +390,9 @@ namespace APT.SK.WebApi.Controllers.Api
pageFilter.Include.Add("Nav_RiskName");
pageFilter.Include.Add("Nav_Details");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId),"Nav_Person");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person");
var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId));
var departs = this.GetEntities<T_FM_DEPARTMENT>(t=>t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId));
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId));
var result = WitOrderPaged(null, pageFilter);
if (result != null && result.Data != null)
{
@ -401,7 +401,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var item in result.Data)
{
//管控措施
var detailStr = new List<string>();
var detailStr = new List<string>();
if (item.Nav_Details != null && item.Nav_Details.Any())
{
var i = 1;
@ -481,7 +481,7 @@ namespace APT.SK.WebApi.Controllers.Api
var temp2 = i + "、" + string.Join(",", departTempNames) + Environment.NewLine;
item.CHECKDEPT = item.CHECKDEPT + temp2;
var departTempIds = departTemps.Select(t => t.ID).ToList();
var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person!=null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
var temp3 = i + "、" + string.Join(",", postTemps) + Environment.NewLine;
item.CHECKPOST = item.CHECKPOST + temp3;
@ -722,7 +722,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
}
if (controlLevelStr.Any())
{
controlLevelStr = controlLevelStr.Distinct().ToList();
@ -847,7 +847,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
item.MineType = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.MineType;
}
checkList.Data = detailContents.GroupBy(t => new { t.MineType, t.CHECK_TYPE_ID, t.CHECK_CYCLE, t.CHECK_TYPE }).Select(m => m.FirstOrDefault()).OrderBy(n=>n.MineType).ThenBy(x=>x.CHECK_TYPE).ThenBy(y=>y.CHECK_TYPE_ID).ToList();
checkList.Data = detailContents.GroupBy(t => new { t.MineType, t.CHECK_TYPE_ID, t.CHECK_CYCLE, t.CHECK_TYPE }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.CHECK_TYPE).ThenBy(y => y.CHECK_TYPE_ID).ToList();
checkList.TotalCount = checkList.Data.Count;
}
return checkList;
@ -915,10 +915,10 @@ namespace APT.SK.WebApi.Controllers.Api
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART item2 = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
item2.DEPARTMENT_ID = item.Nav_DetailDepart.DEPARTMENT_ID;
item2.Nav_Department = item.Nav_DetailDepart.Nav_Department;
item2.POST_NAME = userPosts.FirstOrDefault(t=>t.ID == item.POST_ID)?.NAME;
var tempIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Nav_DetailDepart.DEPARTMENT_ID).Select(m=>m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
item2.POST_NAME = userPosts.FirstOrDefault(t => t.ID == item.POST_ID)?.NAME;
var tempIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Nav_DetailDepart.DEPARTMENT_ID).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var contentTemps = contentList.Where(t => tempIds.Contains(t.ID)).ToList();
item2.Nav_ContentDatas = contentTemps.GroupBy(t => new { t.MineType, t.AREA_NAME, t.CHECK_CONTENT }).Select(m => m.FirstOrDefault()).OrderBy(n=>n.MineType).ThenBy(x=>x.AREA_NAME).ToList();
item2.Nav_ContentDatas = contentTemps.GroupBy(t => new { t.MineType, t.AREA_NAME, t.CHECK_CONTENT }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.AREA_NAME).ToList();
checkTempList.Add(item2);
}
checkList.Data = checkTempList;
@ -983,22 +983,22 @@ namespace APT.SK.WebApi.Controllers.Api
{
throw new Exception("检查周期错误");
}
var departType = FMDepartmentType.部门;
if (filter.Parameter3 == "0")
var departType = FMDepartmentType.Department;
if (filter.Parameter3 == "10")
{
departType = FMDepartmentType.部门;
departType = FMDepartmentType.Department;
}
else if (filter.Parameter3 == "1")
else if (filter.Parameter3 == "15")
{
departType = FMDepartmentType.车间;
departType = FMDepartmentType.Workshop;
}
else if (filter.Parameter3 == "2")
else if (filter.Parameter3 == "20")
{
departType = FMDepartmentType.班组;
departType = FMDepartmentType.Class;
}
else if (filter.Parameter3 == "3")
else if (filter.Parameter3 == "5")
{
departType = FMDepartmentType.公司;
departType = FMDepartmentType.Company;
}
else
{
@ -1103,7 +1103,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
T_SK_ENTERPRISE_LIBRARY_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DEPART();
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 == 0 ? SKDepartmentTypeEnum.部门级 : item.DEPARTMENT_TYPE == 3 ? SKDepartmentTypeEnum.公司级 : item.DEPARTMENT_TYPE == 1 ? SKDepartmentTypeEnum.车间级 : SKDepartmentTypeEnum.班组级;
de.Nav_Department = item;
de.USER_ID = item.USER_ID;
de.Nav_User = item.Nav_User;
@ -1251,7 +1251,7 @@ namespace APT.SK.WebApi.Controllers.Api
var areaName = dtSource.Rows[i][2].ToString().Trim();
if (!string.IsNullOrEmpty(areaName))
{
var area = areas.FirstOrDefault(t=>t.NAME == areaName);
var area = areas.FirstOrDefault(t => t.NAME == areaName);
if (area != null)
{
temp.AREA_ID = area.ID;
@ -1274,7 +1274,7 @@ namespace APT.SK.WebApi.Controllers.Api
var scoreE = dtSource.Rows[i][7].ToString().Trim();
var scoreC = dtSource.Rows[i][8].ToString().Trim();
var scoreD = dtSource.Rows[i][9].ToString().Trim();
temp.EVALUATE_L = string.IsNullOrEmpty(scoreL) ?0:int.Parse(scoreL);
temp.EVALUATE_L = string.IsNullOrEmpty(scoreL) ? 0 : int.Parse(scoreL);
temp.EVALUATE_E = string.IsNullOrEmpty(scoreE) ? 0 : int.Parse(scoreE);
temp.EVALUATE_C = string.IsNullOrEmpty(scoreC) ? 0 : int.Parse(scoreC);
temp.EVALUATE_SCORE = string.IsNullOrEmpty(scoreD) ? 0 : int.Parse(scoreD);
@ -1347,7 +1347,7 @@ namespace APT.SK.WebApi.Controllers.Api
temp.ID = Guid.NewGuid();
temp.ORG_ID = orgId;
var num = dtSource.Rows[i][0].ToString().Trim();
temp.NUM = int.Parse(num) ;
temp.NUM = int.Parse(num);
temp.MineType = dtSource.Rows[i][1].ToString().Trim();
temp.AREA_NAME = dtSource.Rows[i][2].ToString().Trim();
temp.RISK_NAME = dtSource.Rows[i][3].ToString().Trim();
@ -1528,7 +1528,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item2 in item.Nav_PostDetails)
{
var user=users.FirstOrDefault(t => t.ID == item.Nav_Department?.USER_ID);
var user = users.FirstOrDefault(t => t.ID == item.Nav_Department?.USER_ID);
T_SK_ENTERPRISE_LIBRARY_POST part = new T_SK_ENTERPRISE_LIBRARY_POST();
part.DEPARTMENT_ID = item.DEPARTMENT_ID;
part.ORG_ID = item.ORG_ID;
@ -1540,14 +1540,14 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
}
checkList.Data = postLists.GroupBy(t => new { t.DEPARTMENT_ID, t.POST_NAME }).Select(m => m.FirstOrDefault()).OrderBy(m=>m.DEPARTMENT_ID).ToList();
checkList.Data = postLists.GroupBy(t => new { t.DEPARTMENT_ID, t.POST_NAME }).Select(m => m.FirstOrDefault()).OrderBy(m => m.DEPARTMENT_ID).ToList();
if (checkList.Data != null && checkList.Data.Any())
{
var libraryIds = postLists.Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => libraryIds.Contains(t.ID), new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_Details");
foreach (var item in checkList.Data)
{
var tempIds = postLists.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.POST_NAME == item.POST_NAME).Select(m=>m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();
var tempIds = postLists.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.POST_NAME == item.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();
item.Nav_Librarys = librarys.Where(t => tempIds.Contains(t.ID)).ToList();
}
}
@ -1584,7 +1584,7 @@ namespace APT.SK.WebApi.Controllers.Api
T_SK_LIBRARY_IMPORT_MAIN temp = new T_SK_LIBRARY_IMPORT_MAIN();
temp.ID = Guid.NewGuid();
temp.ORG_ID = orgId;
temp.NUM = i+1;
temp.NUM = i + 1;
temp.MineType = dtSource.Rows[i][0].ToString().Trim();
temp.AREA_NAME = dtSource.Rows[i][1].ToString().Trim();
temp.RISK_NAME = dtSource.Rows[i][2].ToString().Trim();
@ -1840,16 +1840,16 @@ namespace APT.SK.WebApi.Controllers.Api
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"});
}
else if(mineType!=null && areaId != null && typeId != null && riskName!=null && riskDes!=null)
else if (mineType != null && areaId != null && typeId != null && riskName != null && riskDes != null)
{
var temp = SKProductionUnit.All;
switch (mineType.Value)
{
case 0:
temp = SKProductionUnit.All;
temp = SKProductionUnit.All;
break;
case 10:
temp = SKProductionUnit.MineChoose;
temp = SKProductionUnit.MineChoose;
break;
case 20:
temp = SKProductionUnit.Minelast;
@ -1867,16 +1867,16 @@ namespace APT.SK.WebApi.Controllers.Api
temp = SKProductionUnit.Nonmetallic;
break;
default:
temp = SKProductionUnit.All;
temp = SKProductionUnit.All;
break;
}
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t=>t.MineType == temp && t.AREA_ID == (Guid)areaId.Value && t.TYPE_ID == (Guid)typeId.Value && t.RISK_NAME == riskName.Value.ToString() && t.RISK_DESCRIPTION == riskDes.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == temp && t.AREA_ID == (Guid)areaId.Value && t.TYPE_ID == (Guid)typeId.Value && t.RISK_NAME == riskName.Value.ToString() && t.RISK_DESCRIPTION == riskDes.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"});
}
if (result != null)
{
var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => t.ENTERPRISE_LIBRARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User");
result.Nav_Departs = departs.OrderBy(t=>t.DEPARTMENT_TYPE).ThenBy(m => m.DEPARTMENT_ID).ToList();
result.Nav_Departs = departs.OrderBy(t => t.DEPARTMENT_TYPE).ThenBy(m => m.DEPARTMENT_ID).ToList();
var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.ENTERPRISE_LIBRARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
result.Nav_Posts = posts.OrderBy(t => t.DEPARTMENT_ID).ToList();
var details = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => t.ENTERPRISE_LIBRARY_ID == result.ID, new BaseFilter(filter.OrgId));
@ -1895,7 +1895,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var content in detail.Nav_DetailContents)
{
var departTemps = contentdeparts.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID == content.ID).ToList();
content.Nav_DetailDeparts = departTemps.OrderBy(t => t.CHECK_TYPE).ThenBy(m=>m.DEPARTMENT_ID).ToList();
content.Nav_DetailDeparts = departTemps.OrderBy(t => t.CHECK_TYPE).ThenBy(m => m.DEPARTMENT_ID).ToList();
var hiddenTemps = contenthiddens.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID == content.ID).ToList();
content.Nav_DetailHiddens = hiddenTemps.OrderBy(t => t.NUM).ToList();
var basicTemps = contentbasics.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID == content.ID).ToList();
@ -1903,7 +1903,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
}
result.Nav_Details = details.OrderBy(t=>t.NUM).ToList();
result.Nav_Details = details.OrderBy(t => t.NUM).ToList();
}
return result;
});