ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wyw 2024-04-10 13:50:51 +08:00
commit cb0f15e8e5
9 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,14 +968,17 @@ namespace APT.FO.WebApi.Controllers
}
else
{
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
}
}
}
}
@ -1540,6 +1543,7 @@ namespace APT.FO.WebApi.Controllers
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
pageFilter.IgnoreDataRule = true;
//安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)

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

@ -320,21 +320,32 @@ namespace APT.FO.WebApi.Controllers
if (appdetails != null && appdetails.Any())//curentApprove == null
{
var sendUserIds = new List<Guid>();
//var curentApprove = appdetails.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing);
var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId);
if (curentApprove != null)
{
var removeApprove = appdetails.Where(i => i.NUM < curentApprove.NUM && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing);
if (removeApprove != null && removeApprove.Any())
{
foreach (var item in removeApprove)
{
appdetails.Remove(item);
}
}
}
var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
if (detailTemps != null && detailTemps.Any())
{
appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
sendUserIds = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
}
else
{
var appdetailsAll = appdetails;
var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId);
appdetailsAll.Remove(removeTemps);
appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
}
//else
//{
// var appdetailsAll = appdetails;
// var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId);
// appdetailsAll.Remove(removeTemps);
// appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
// sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
//}
if (sendUserIds != null && sendUserIds.Any())
{
var sendUserNames = new List<string>();
@ -456,14 +467,17 @@ namespace APT.FO.WebApi.Controllers
}
else
{
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
}
}
}
}
@ -623,6 +637,7 @@ namespace APT.FO.WebApi.Controllers
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
pageFilter.IgnoreDataRule = true;
//安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)

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

@ -116,7 +116,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
{
var meetingTime = DateTime.Now;
//meetingTime = DateTime.Parse("2023-06-15 06:30:00");
if (entity.START_TIME.AddMinutes(-15) >= meetingTime)
if (entity.START_TIME!= DateTime.MinValue && entity.START_TIME.AddMinutes(-15) >= meetingTime)
{
throw new Exception("班前会议需等到" + entity.START_TIME.AddMinutes(-15) + "后提交!");
}

1
APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs
View File

@ -535,6 +535,7 @@ namespace APT.HM.WebApi.Controllers.Api
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
pageFilter.IgnoreDataRule = true;
//安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)

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

@ -830,6 +830,7 @@ namespace APT.HM.WebApi.Controllers.Api
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
pageFilter.IgnoreDataRule = true;
//安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t=>t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)

1
APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs
View File

@ -663,6 +663,7 @@ namespace APT.HM.WebApi.Controllers.Api
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
pageFilter.IgnoreDataRule = true;
//安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)

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

@ -144,7 +144,7 @@ namespace APT.HM.WebApi.Controllers.Api
listRiskArea.Add(area);
foreach (var level in levels)
{
var sendUsers = GetEntities<T_HM_EVALUATE_RISK>(t => t.AREA_ID == Area.AREA_ID && t.DEPARTMENT_LIABLE_ID != null && t.LEVEL == (FMDepartmentType)int.Parse(level), new BaseFilter(entity.ORG_ID)).Select(t => new { t.DEPARTMENT_LIABLE_ID }).Distinct();
var sendUsers = GetEntities<T_HM_EVALUATE_RISK>(t => t.AREA_ID == Area.AREA_ID &&t.Nav_DepartmentLiable.IS_DELETED==false && t.DEPARTMENT_LIABLE_ID != null && t.LEVEL == (FMDepartmentType)int.Parse(level), new BaseFilter(entity.ORG_ID)).Select(t => new { t.DEPARTMENT_LIABLE_ID }).Distinct();
if (sendUsers.Any())
{
T_HM_RISK_TASK_DETAIL taskDetail = new T_HM_RISK_TASK_DETAIL();

1
APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs
View File

@ -903,6 +903,7 @@ namespace APT.HM.WebApi.Controllers.Api
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
pageFilter.IgnoreDataRule = true;
//安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)

1
APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs
View File

@ -660,6 +660,7 @@ namespace APT.HM.WebApi.Controllers.Api
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
pageFilter.IgnoreDataRule = true;
//安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)