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-03-05 14:34:42 +08:00
commit 7e381a72b2
8 changed files with 231 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,15 +445,17 @@ namespace APT.BaseData.Services.Services.FM
});
var loginUser = users.FirstOrDefault(t => t.ID == loginUserId);
var departUser = this.GetEntity<T_FM_DEPARTMENT>(t => (t.USER_ID == loginUserId || t.CHARGEUSER_ID == loginUserId) && (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")));
if (departUser != null || (loginUser.Nav_ApproveRole!=null &&loginUser.Nav_ApproveRole.NAME.Contains("安环部负责人")))
if (departUser != null || (loginUser.Nav_ApproveRole != null && loginUser.Nav_ApproveRole.NAME.Contains("安环部负责人")) || (loginUser.Nav_ApproveRole != null && loginUser.Nav_ApproveRole.NAME.Contains("安环部安全员")))
{
var tempSafe = appdetails.FirstOrDefault(m => m.Nav_ApproveRole!=null && m.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (tempSafe != null)
var tempSafeD = appdetails.FirstOrDefault(m => m.Nav_ApproveRole != null && m.Nav_ApproveRole.NAME.Contains("部门安全员"));
var tempSafe = appdetails.FirstOrDefault(m => m.Nav_ApproveRole != null && m.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (tempSafe != null && tempSafeD != null && appdetails.Count() > 1 && tempSafeD.APPROVE_USER_ID == tempSafe.APPROVE_USER_ID)
{
appdetails.Remove(tempSafe);
}
var tempChargeD = appdetails.FirstOrDefault(m => m.Nav_ApproveRole != null && m.Nav_ApproveRole.NAME.Contains("部门负责人"));
var tempCharge = appdetails.FirstOrDefault(m => m.Nav_ApproveRole != null && m.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (tempCharge != null)
if (tempCharge != null && tempChargeD != null && appdetails.Count() > 1 && tempChargeD.APPROVE_USER_ID == tempCharge.APPROVE_USER_ID)
{
appdetails.Remove(tempCharge);
}
@ -1437,12 +1439,12 @@ namespace APT.BaseData.Services.Services.FM
Guid? approveId = null;
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
{
var approveIds= users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t=>t.ID).ToList();
var approveIds = users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t => t.ID).ToList();
if (approveIds.Count() == 0)
{
if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人")
{
var dep = GetEntity<T_FM_DEPARTMENT>(t=>(t.NAME.Contains("安全环保")|| t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0);
var dep = GetEntity<T_FM_DEPARTMENT>(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0);
if (dep != null)
{
if (dep.USER_ID.HasValue)
@ -1465,8 +1467,8 @@ namespace APT.BaseData.Services.Services.FM
GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any())
{
var dep = GetEntity<T_FM_DEPARTMENT>(t=> departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE != 3 && approveIds.Contains((Guid)t.CHARGEUSER_ID));
if(dep !=null)
var dep = GetEntity<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE != 3 && approveIds.Contains((Guid)t.CHARGEUSER_ID));
if (dep != null)
approveId = dep.CHARGEUSER_ID;
}
}
@ -1481,6 +1483,8 @@ namespace APT.BaseData.Services.Services.FM
GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any())
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部负责人");
var chargeSafe = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员");
foreach (var item in departmentIds)
{
var userTemp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
@ -1488,13 +1492,12 @@ namespace APT.BaseData.Services.Services.FM
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部负责人");
if (charge != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && x.DEPARTMENT_ID == item);
if (temp == null)
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp2 != null)
{
approveId = temp2.ID;
@ -1502,20 +1505,15 @@ namespace APT.BaseData.Services.Services.FM
}
else
{
if (user.DEPARTMENT_ID.HasValue)
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
{
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;
}
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
}
else
continue;
}
}
else
@ -1525,96 +1523,43 @@ namespace APT.BaseData.Services.Services.FM
}
}
else
{
var departInfo=this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == user.DEPARTMENT_ID);
if (departInfo != null)
{
if (departInfo.USER_ID != null)
{ approveId = departInfo.USER_ID; }
else if (departInfo.CHARGEUSER_ID != null)
{ approveId = departInfo.CHARGEUSER_ID; }
else
{ continue; }
}
else
{
continue;
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员");
if (charge != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
if (temp == null)
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
if (temp2 != null)
{
approveId = temp2.ID;
break;
}
else
{
if (user.DEPARTMENT_ID.HasValue)
{
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;
}
}
else
continue;
}
}
else
{
approveId = temp?.ID;
break;
}
}
else
{
var departInfo = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == user.DEPARTMENT_ID);
if (departInfo != null)
{
if (departInfo.USER_ID != null)
{ approveId = departInfo.USER_ID; }
else if (departInfo.CHARGEUSER_ID != null)
{ approveId = departInfo.CHARGEUSER_ID; }
else
{ continue; }
}
else
{
continue;
}
}
}
else
{
var departInfo = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == user.DEPARTMENT_ID);
if (departInfo != null)
{
if (departInfo.USER_ID != null)
{ approveId = departInfo.USER_ID; }
else if (departInfo.CHARGEUSER_ID != null)
{ approveId = departInfo.CHARGEUSER_ID; }
else
{ continue; }
}
else
{
continue;
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
if (chargeSafe != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == chargeSafe.ID && x.DEPARTMENT_ID == item);
if (temp == null)
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp2 != null)
{
approveId = temp2.ID;
break;
}
else
{
continue;
}
}
else
{
approveId = temp?.ID;
break;
}
}
else
{
continue;
}
}
else
{
continue;
}
}
else
{
@ -1627,7 +1572,6 @@ namespace APT.BaseData.Services.Services.FM
}
return approveId;
}
/// <summary>
/// 根据部门树查找审核人
/// </summary>

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

@ -591,7 +591,18 @@ namespace APT.FO.WebApi.Controllers
var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
var tempList = mineType.Split(",").ToList();
Expression<Func<T_HM_OPERATION_STEP, bool>> expressionStep = e => !e.IS_DELETED && e.STATUS == STATUSEnum.启用;
Expression<Func<T_HM_OPERATION_LINK, bool>> expressionLink = t => !t.IS_DELETED && t.STATUS == (int)STATUSEnum.启用 && tempList.Contains(t.MineType.ToString());
Expression<Func<T_HM_OPERATION_LINK, bool>> expressionLink = t => !t.IS_DELETED && t.STATUS == (int)STATUSEnum.启用;
if (tempList != null && tempList.Any())
{
bool isExsis = false;
foreach (var temp in tempList)
{
if (!string.IsNullOrEmpty(temp))
isExsis = true;
}
if (isExsis)
expressionLink = expressionLink.And(t => tempList.Contains(t.MineType.ToString()));
}
var operationLink = this.GetEntities<T_HM_OPERATION_LINK>(expressionLink, new BaseFilter(pageFilter.OrgId)).Select(t => t.OPERATION_STEP_ID).Distinct().ToList();
expressionStep = expressionStep.And(e => operationLink.Contains(e.ID));
var info = this.GetOrderEntities<T_HM_OPERATION_STEP>(expressionStep, pageFilter, null);
@ -613,7 +624,18 @@ namespace APT.FO.WebApi.Controllers
var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
var tempList = mineType.Split(",").ToList();
Expression<Func<T_HM_OPERATION_STEP, bool>> expressionStep = e => !e.IS_DELETED && e.STATUS == STATUSEnum.启用;
Expression<Func<T_HM_OPERATION_LINK, bool>> expressionLink = t => !t.IS_DELETED && t.STATUS == (int)STATUSEnum.启用 && tempList.Contains(t.MineType.ToString());
Expression<Func<T_HM_OPERATION_LINK, bool>> expressionLink = t => !t.IS_DELETED && t.STATUS == (int)STATUSEnum.启用;
if (tempList != null && tempList.Any())
{
bool isExsis = false;
foreach (var temp in tempList)
{
if (!string.IsNullOrEmpty(temp))
isExsis = true;
}
if(isExsis)
expressionLink = expressionLink.And(t => tempList.Contains(t.MineType.ToString()));
}
var operationLink = this.GetEntities<T_HM_OPERATION_LINK>(expressionLink, new BaseFilter(pageFilter.OrgId)).Select(t=>t.OPERATION_STEP_ID).Distinct().ToList();
expressionStep = expressionStep.And(e => operationLink.Contains(e.ID));
var info = this.GetOrderPageEntities<T_HM_OPERATION_STEP>(expressionStep, pageFilter, null);
@ -881,7 +903,21 @@ namespace APT.FO.WebApi.Controllers
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
{
var approveIds = users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t => t.ID).ToList();
if (approveIds.Count() == 1)
if (approveIds.Count() == 0)
{
if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人")
{
var dep = GetEntity<T_FM_DEPARTMENT>(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0);
if (dep != null)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
}
}
}
else if (approveIds.Count() == 1)
{
approveId = approveIds.FirstOrDefault();
}
@ -910,6 +946,8 @@ namespace APT.FO.WebApi.Controllers
GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any())
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部负责人");
var chargeSafe = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员");
foreach (var item in departmentIds)
{
var userTemp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
@ -917,13 +955,12 @@ namespace APT.FO.WebApi.Controllers
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部负责人");
if (charge != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && x.DEPARTMENT_ID == item);
if (temp == null)
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp2 != null)
{
approveId = temp2.ID;
@ -931,20 +968,15 @@ namespace APT.FO.WebApi.Controllers
}
else
{
if (user.DEPARTMENT_ID.HasValue)
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
{
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;
}
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
}
else
continue;
}
}
else
@ -954,96 +986,43 @@ namespace APT.FO.WebApi.Controllers
}
}
else
{
var departInfo = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == user.DEPARTMENT_ID);
if (departInfo != null)
{
if (departInfo.USER_ID != null)
{ approveId = departInfo.USER_ID; }
else if (departInfo.CHARGEUSER_ID != null)
{ approveId = departInfo.CHARGEUSER_ID; }
else
{ continue; }
}
else
{
continue;
}
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员");
if (charge != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
if (temp == null)
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
if (temp2 != null)
{
approveId = temp2.ID;
break;
}
else
{
if (user.DEPARTMENT_ID.HasValue)
{
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;
}
}
else
continue;
}
}
else
{
approveId = temp?.ID;
break;
}
}
else
{
var departInfo = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == user.DEPARTMENT_ID);
if (departInfo != null)
{
if (departInfo.USER_ID != null)
{ approveId = departInfo.USER_ID; }
else if (departInfo.CHARGEUSER_ID != null)
{ approveId = departInfo.CHARGEUSER_ID; }
else
{ continue; }
}
else
{
continue;
}
}
}
else
{
var departInfo = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == user.DEPARTMENT_ID);
if (departInfo != null)
{
if (departInfo.USER_ID != null)
{ approveId = departInfo.USER_ID; }
else if (departInfo.CHARGEUSER_ID != null)
{ approveId = departInfo.CHARGEUSER_ID; }
else
{ continue; }
}
else
{
continue;
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
if (chargeSafe != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == chargeSafe.ID && x.DEPARTMENT_ID == item);
if (temp == null)
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp2 != null)
{
approveId = temp2.ID;
break;
}
else
{
continue;
}
}
else
{
approveId = temp?.ID;
break;
}
}
else
{
continue;
}
}
else
{
continue;
}
}
else
{

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

@ -389,7 +389,42 @@ namespace APT.FO.WebApi.Controllers
{
Guid? approveId = null;
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.公司)
approveId = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID)?.ID;
{
var approveIds = users.Where(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID).Select(t => t.ID).ToList();
if (approveIds.Count() == 0)
{
if (approveTempDetail.Nav_ApproveRole.NAME == "安环部负责人")
{
var dep = GetEntity<T_FM_DEPARTMENT>(t => (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部")) && t.DEPARTMENT_TYPE == 0 && t.ENABLE_STATUS == 0);
if (dep != null)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
}
}
}
else if (approveIds.Count() == 1)
{
approveId = approveIds.FirstOrDefault();
}
else
{
var user = users.FirstOrDefault(t => t.ID == loginUserId);
if (user.DEPARTMENT_ID != null)
{
List<Guid> departmentIds = new List<Guid>();
GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any())
{
var dep = GetEntity<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE != 3 && approveIds.Contains((Guid)t.CHARGEUSER_ID));
if (dep != null)
approveId = dep.CHARGEUSER_ID;
}
}
}
}
else
{
var user = users.FirstOrDefault(t => t.ID == loginUserId);
@ -399,6 +434,8 @@ namespace APT.FO.WebApi.Controllers
GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any())
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部负责人");
var chargeSafe = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员");
foreach (var item in departmentIds)
{
var userTemp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
@ -406,12 +443,30 @@ namespace APT.FO.WebApi.Controllers
{
if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门负责人")
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部负责人");
if (charge != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && x.DEPARTMENT_ID == item);
if (temp == null)
continue;
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp2 != null)
{
approveId = temp2.ID;
break;
}
else
{
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;
}
}
}
else
{
approveId = temp?.ID;
@ -419,16 +474,28 @@ namespace APT.FO.WebApi.Controllers
}
}
else
{
continue;
}
}
else if (approveTempDetail.DEPARTMENT_TYPE == (int)FMDepartmentType.部门 && approveTempDetail.Nav_ApproveRole != null && approveTempDetail.Nav_ApproveRole.NAME == "部门安全员")
{
var charge = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员");
if (charge != null)
if (chargeSafe != null)
{
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == charge.ID && departmentIds.Contains((Guid)x.DEPARTMENT_ID));
var temp = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == chargeSafe.ID && x.DEPARTMENT_ID == item);
if (temp == null)
continue;
{
var temp2 = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == approveTempDetail.APPROVE_ROLE_ID && x.DEPARTMENT_ID == item);
if (temp2 != null)
{
approveId = temp2.ID;
break;
}
else
{
continue;
}
}
else
{
approveId = temp?.ID;
@ -436,7 +503,9 @@ namespace APT.FO.WebApi.Controllers
}
}
else
{
continue;
}
}
else
{

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

@ -158,12 +158,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO
if (currCalendar != null)
{
var currCalendarID = currCalendar.CALENDAR_ID;
var currDepartmentConfig = this.GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG>(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID);
if (currDepartmentConfig == null)
var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(t => t.TEAM_ID == entity.CLASS_TEAM_ID&&t.IS_DELETED==false, "Nav_DepartmentCalendarConfig");
if (currDepartmentConfig.Nav_DepartmentCalendarConfig == null)
{
throw new Exception("未找到排班数据!");
}
if (currDepartmentConfig.IS_HANDOVER == true)
if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
{
var searchFilter = new BaseFilter(entity.ORG_ID);
searchFilter.SelectField = new string[] { "TEAM_ID", "PERSON_ID", "Nav_Person.Nav_Post", "Nav_Person.Nav_User", "Nav_DepartmentScheduling" };
@ -295,11 +295,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO
else
{
var currCalendarID = this.GetEntity<T_FM_CALENDAR_CLASS>(t => t.CLASS_ID == entity.CLASS_ID).CALENDAR_ID;
var currDepartmentConfig = this.GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG>(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID);
var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(t => t.TEAM_ID == currRecord.CLASS_TEAM_ID, "Nav_DepartmentCalendarConfig");
currRecord.AUDIT_DATE = DateTime.Now;
currRecord.SHIFT_STATUS = (int)FOShiftStatusEnum.归档;
currRecord.AUDIT_OPINION = entity.AUDIT_OPINION;
if (currDepartmentConfig.IS_HANDOVER == true)
if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
{
var users = currRecord.Nav_Users;
var files = currRecord.Nav_Files;
@ -388,8 +388,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO
model.AUDIT_DATE = DateTime.Now;
var currCalendar = this.GetEntity<T_FM_CALENDAR_CLASS>(t => t.CLASS_ID == model.CLASS_ID);
var currCalendarID = currCalendar.CALENDAR_ID;
var currDepartmentConfig = this.GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG>(t => t.DEPARTMENT_ID == model.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID);
if (currDepartmentConfig.IS_HANDOVER == true)
var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(t => t.TEAM_ID == model.CLASS_TEAM_ID&&t.IS_DELETED==false, "Nav_DepartmentCalendarConfig");
if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
{
var users = GetEntities<T_FO_CURRENT_CLASS_RECORD_USER>(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList();
var files = GetEntities<T_FO_CURRENT_CLASS_RECORD_FILE>(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList();

9
APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
View File

@ -48,10 +48,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
var files = entity.Nav_TeamActivityFile;
entity.Nav_TeamActivityFile = null;
if (files==null||files.Count()==0)
{
throw new Exception("请上传附件!");
}
if (entity.ACTIVITY_TIME == DateTime.MinValue)
{
throw new Exception("请修改活动日期!");
@ -95,6 +92,10 @@ namespace APT.FO.WebApi.Controllers.Api.FO
if (entity != null && entity.OpType == 0)
{
if (files==null||files.Count()==0)
{
throw new Exception("请上传附件!");
}
//通知参会人员签到
var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var baseFilter = new BaseFilter(entity.ORG_ID);

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

@ -31,7 +31,7 @@ namespace APT.HM.WebApi.Controllers.Api
{
return SafeExecute(() =>
{
var history = this.GetEntity<T_HM_OPERATION_LINK>(t => t.OPERATION_STEP_ID == entity.OPERATION_STEP_ID, "Nav_OperationStep");
var history = this.GetEntity<T_HM_OPERATION_LINK>(t => t.OPERATION_STEP_ID == entity.OPERATION_STEP_ID && t.ID != entity.ID, "Nav_OperationStep");
if (history != null)
throw new Exception("已存在名为"+ history.Nav_OperationStep.NAME+"的数据,请修改作业名称");
var details = entity.Nav_LinkPost;

1
APT.MicroApi/APT.PF.WebApi/appsettings.Development.json
View File

@ -19,7 +19,6 @@
},
"RedisConfig": {
"RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15",
"RedisConnectionPwd": "mhsaferedis",
"IsRedis": true
},
"InflexdbConfig": {

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs
View File

@ -46,6 +46,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE
throw new Exception("通知发送，不可更改");
}
var Nav_TrainContentList = entity.Nav_TrainContentList;
if (Nav_TrainContentList.Count()==0)
{
throw new Exception("请选择培训内容");
}
var Nav_TrainUserList = entity.Nav_TrainUserList.Where(t => t.USER_ID != Guid.Empty);
var Nav_Files = entity.Nav_Files;
List<T_FM_NOTIFICATION_TASK> sendNoticeTask = null;