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

213

Browse Source
This commit is contained in:
wyw 2025-10-23 09:59:49 +08:00
commit 1c9f67e3dd
27 changed files with 147249 additions and 16261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12371,7 +12371,12 @@ namespace APT.BaseData.Services.DomainServices
}
}
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK033");
var endDate = DateTime.Now.AddHours(24);
if (entity.END_DATE != null)
{
endDate = Convert.ToDateTime(entity.END_DATE.ToString().Replace("0:00:00", "23:59:59"));
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, endDate, (int)FMNoticeTypeEnum.消息, "SK033");
notices.Add(noticeTask);
}
}
@ -12454,87 +12459,123 @@ namespace APT.BaseData.Services.DomainServices
}
var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
if (currentDepart != null)
{
if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
departIds.Add(currentDepart.ID);
var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID);
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
var parentId = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.PARENT_ID;
departIds.Add((Guid)parentId);
var classIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
//车间负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds.Add(currentDepart.ID);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
{
if (currentDepart.DEPARTMENT_STATUS != 1)
{
departIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
departIds.Add(currentDepart.ID);
var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID);
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
departIds.Add((Guid)parentId);
var classIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
//车间负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
//if (currentDepart.DEPARTMENT_STATUS == 0)
//{
// user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
// if (user != null)
// {
// userId = user.ID;
// }
//}
//当前层级安全员和负责人都找不到，找一次上级安全员和负责人
if (userId == null)
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
//车间负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
var requre = this.GetEntity<T_SK_REQUEST>(t => !t.IS_DELETED);
var filter = new BaseFilter(entity.ORG_ID);
filter.IgnoreDataRule = true;
@ -12560,39 +12601,30 @@ namespace APT.BaseData.Services.DomainServices
var identityIds = identitys.Select(t => t.ID).ToList();
//Expression<Func<T_SK_RISK_IDENTIFY_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && identityIds.Contains(i.RISK_IDENTIFY_ID);
//List<T_SK_RISK_IDENTIFY_DETAIL> list = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID)).ToList();
var list = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => identityIds.Contains(t.RISK_IDENTIFY_ID), new BaseFilter(entity.ORG_ID));
var detailList = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID });
var list = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => identityIds.Contains(t.RISK_IDENTIFY_ID), new BaseFilter(entity.ORG_ID));
var detailList = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
if (detailList.Any())
{
foreach (var item in detailList)
{
var mark = librarys.FirstOrDefault(m => m.AREA_ID == item.Key.AREA_ID && m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID);
var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
//本组是否存在有效数据
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
//本组是否存在无效数据
//var tempNo = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.No);
if (tempYes != null)
{
//存在有效数据时只取有效部门岗位
identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList();
}
var departIdss = identitys.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identitys.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.Key.TYPE_ID;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE;
ideDetail.EMERGENCY = tempYes != null ? tempYes.EMERGENCY : temp[0]?.EMERGENCY;
ideDetail.ENABLE_STATUS = tempYes != null ? tempYes.ENABLE_STATUS : temp[0].ENABLE_STATUS;
//ideDetail.DEPARTMENT_TYPE = "岗位级";
ideDetail.MARK = mark == null ? SKMarkEnum.Add : temp[0].MARK;
{
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identitys.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identitys.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
ideDetail.MineType = item.MineType;
ideDetail.AREA_ID = item.AREA_ID;
ideDetail.RISK_NAME = item.RISK_NAME;
ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.MEASURE = item.MEASURE;
ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.MARK = item.MARK;
if (departIdss.Any())
{
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).Select(m => m.DEPARTMENT_TYPE).Distinct().ToList();
@ -12732,117 +12764,125 @@ namespace APT.BaseData.Services.DomainServices
}
var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
if (currentDepart != null)
{
if (currentDepart.DEPARTMENT_STATUS != 1)
{
departIds.Add(currentDepart.ID);
var otherIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(t => t.ID).ToList();
departIds.AddRange(otherIds);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
//departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
if (parentId != null)
{
departIds.Add(parentId.Value);
var shopIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
//部门负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID);
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
var parentId2 = departs.FirstOrDefault(t => t.ID == parentId)?.PARENT_ID;
if (parentId2 != null)
{
departIds.Add((Guid)parentId2);
var shopIds = departs.Where(t => t.PARENT_ID == parentId2).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId2 && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
//部门负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId2);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds.Add(currentDepart.ID);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
{
if (currentDepart.DEPARTMENT_STATUS != 1)
{
//departIds.Add(currentDepart.ID);
var otherIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(t => t.ID).ToList();
departIds.AddRange(otherIds);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
//departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
if (parentId != null)
{
departIds.Add(parentId.Value);
var shopIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
//部门负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID);
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
var parentId2 = departs.FirstOrDefault(t => t.ID == parentId)?.PARENT_ID;
if (parentId2 != null)
{
departIds.Add((Guid)parentId2);
var shopIds = departs.Where(t => t.PARENT_ID == parentId2).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId2 && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
//部门负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId2);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
//var departId = departs.FirstOrDefault(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 0);
//if (departId != null)
@ -12889,35 +12929,33 @@ namespace APT.BaseData.Services.DomainServices
//Expression<Func<T_SK_RISK_IDENTIFY_RESULT_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID);
//List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> details = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID), new string[] { "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts" }).ToList();
var details = GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(i => resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID) && i.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts");
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID });
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
if (detailList.Any())
{
foreach (var de in detailList)
{
var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.IDENTIFY_RESULT_SUMMARY_ID = sum.ID;
//ideDetail.MineType = de.Key.MineType;
ideDetail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = de.Key.AREA_ID;
ideDetail.RISK_NAME = de.Key.RISK_NAME;
//ideDetail.RISK_NAME_ID = de.Key.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION;
ideDetail.TYPE_ID = de.Key.TYPE_ID;
ideDetail.MEASURE = temp?.MEASURE;
ideDetail.EMERGENCY = temp?.EMERGENCY;
ideDetail.RISK_NAME_ID = temp?.RISK_NAME_ID;
ideDetail.DEPARTMENT_TYPE = temp?.DEPARTMENT_TYPE;
ideDetail.IDENTIFY_DEPARTMENT = temp?.IDENTIFY_DEPARTMENT;
ideDetail.IDENTIFY_POST = temp?.IDENTIFY_POST;
ideDetail.MARK = temp == null ? SKMarkEnum.Add : temp.MARK;
summaryDetails.Add(ideDetail);
{
foreach (var de in detailList)
{
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.IDENTIFY_RESULT_SUMMARY_ID = sum.ID;
ideDetail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID;
ideDetail.MineType = de.MineType;
ideDetail.AREA_ID = de.AREA_ID;
ideDetail.RISK_NAME = de.RISK_NAME;
ideDetail.RISK_NAME_ID = de.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = de.RISK_DESCRIPTION;
ideDetail.TYPE_ID = de.TYPE_ID;
ideDetail.MEASURE = de.MEASURE;
ideDetail.EMERGENCY = de.EMERGENCY;
ideDetail.DEPARTMENT_TYPE = de.DEPARTMENT_TYPE;
ideDetail.IDENTIFY_DEPARTMENT = de.IDENTIFY_DEPARTMENT;
ideDetail.IDENTIFY_POST = de.IDENTIFY_POST;
ideDetail.MARK = de.MARK;
summaryDetails.Add(ideDetail);
}
}
var param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype == 5 || (dminetype == 10 && sum.ISCOMPANY == SKIsStoreEnum.Yes))
if (dminetype == 5 || sum.ISCOMPANY == SKIsStoreEnum.Yes)
{
param = "公司级";
}
@ -13021,55 +13059,37 @@ namespace APT.BaseData.Services.DomainServices
var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
if (currentDepart != null)
{
if (entity.ISCOMPANY == SKIsStoreEnum.Yes)
{
departIds.Add(currentDepart.ID);
}
else
{
if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
//departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
if (parentId != null)
{
departIds.Add(parentId.Value);
var shopIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
//var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
//departIds.Add((Guid)parentId);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
var parentId2 = departs.FirstOrDefault(t => t.ID == parentId)?.PARENT_ID;
if (parentId2 != null)
{
departIds.Add((Guid)parentId2);
var shopIds = departs.Where(t => t.PARENT_ID == parentId2).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds.Add(currentDepart.ID);
}
if (currentDepart.DEPARTMENT_STATUS != 1)
{
departIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
departIds.Add(currentDepart.ID);
var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
departIds.Add((Guid)parentId);
var classIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
}
}
var requre = this.GetEntity<T_SK_EVALUATION>(t => !t.IS_DELETED);
@ -13123,8 +13143,8 @@ namespace APT.BaseData.Services.DomainServices
detail.SCOREL_ID = departTemp?.SCOREL_ID;
detail.EVALUATE_SCORE = departTemp == null ? 0 : departTemp.EVALUATE_SCORE;
detail.EVALUATE_LEVEL = departTemp == null ? SKEvaluateLevelEnum.低风险 : departTemp.EVALUATE_LEVEL;
detail.EMERGENCY = departTemp == null ? "" : departTemp.EMERGENCY;
detail.MARK = departTemp == null ? SKMarkEnum.Add : SKMarkEnum.Auto;
detail.MARK = de.MARK;
detail.MEASURE = de.MEASURE;
if (departTemp != null)
{
var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList();
@ -13142,8 +13162,6 @@ namespace APT.BaseData.Services.DomainServices
detailMeasures.Add(dep);
var measureTemp = i + "、" + item.MEASURES_NAME + "；";
detail.MEASURE = detail.MEASURE + measureTemp;
//var emergencyTemp = i + "、" + item.EMERGENCY + "；";
//detail.EMERGENCY = detail.EMERGENCY + emergencyTemp;
i++;
}
}
@ -13175,22 +13193,22 @@ namespace APT.BaseData.Services.DomainServices
resultDetails.Add(detail);
}
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039");
notices.Add(noticeTask);
T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN();
modelBegin.ID = Guid.NewGuid();
modelBegin.ORG_ID = entity.ORG_ID;
modelBegin.SOURCETYPE = SOURCETYPE.SK037ToMeet;
modelBegin.TABLENAME = "T_SK_RISK_IDENTIFY_RESULT_SUMMARY";
modelBegin.DATA_ID = entity.ID;
modelBegin.ISBEGIN = false;
modelBegin.USER_ID = user.ID;
modelBegin.CREATE_TIME = DateTime.Now;
modelBegin.CREATER_ID = user.ID;
modelBegins.Add(modelBegin);
//var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039");
//notices.Add(noticeTask);
//T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN();
//modelBegin.ID = Guid.NewGuid();
//modelBegin.ORG_ID = entity.ORG_ID;
//modelBegin.SOURCETYPE = SOURCETYPE.SK037ToMeet;
//modelBegin.TABLENAME = "T_SK_RISK_IDENTIFY_RESULT_SUMMARY";
//modelBegin.DATA_ID = entity.ID;
//modelBegin.ISBEGIN = false;
//modelBegin.USER_ID = user.ID;
//modelBegin.CREATE_TIME = DateTime.Now;
//modelBegin.CREATER_ID = user.ID;
//modelBegins.Add(modelBegin);
//触发今日提醒
//var noticeDay = NotificationTaskService.InsertUserNoticeTaskModel("危险源辨识与风险评估", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.今日提醒, "PF135");
//notices.Add(noticeDay);
var noticeDay = NotificationTaskService.InsertUserNoticeTaskModel("请召开《危险源辨识与风险评估》会议，确定风险等级和管控措施（含应急处置、辨识岗位、管控层级、检查内容、检查层级等）", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.今日提醒, "PF135");
notices.Add(noticeDay);
}
}
}
@ -13282,79 +13300,110 @@ namespace APT.BaseData.Services.DomainServices
}
var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
if (currentDepart != null)
{
if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
//departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
if (parentId != null)
{
departIds.Add(parentId.Value);
var shopIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID);
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
var parentId2 = departs.FirstOrDefault(t => t.ID == parentId)?.PARENT_ID;
if (parentId2 != null)
{
departIds.Add((Guid)parentId2);
var shopIds = departs.Where(t => t.PARENT_ID == parentId2).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds.Add(currentDepart.ID);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
}
var departId = departs.FirstOrDefault(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 10);
if (departId != null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
if (currentDepart.DEPARTMENT_STATUS == 0)
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
{
if (currentDepart.DEPARTMENT_STATUS != 1)
{
departIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
{
departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
else if (currentDepart.DEPARTMENT_TYPE == 15)
{
//departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
if (parentId != null)
{
departIds.Add(parentId.Value);
var shopIds = departs.Where(t => t.PARENT_ID == parentId).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID);
}
else if (currentDepart.DEPARTMENT_TYPE == 20)
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
var parentId2 = departs.FirstOrDefault(t => t.ID == parentId)?.PARENT_ID;
if (parentId2 != null)
{
departIds.Add((Guid)parentId2);
var shopIds = departs.Where(t => t.PARENT_ID == parentId2).Select(t => t.ID).ToList();
departIds.AddRange(shopIds);
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.DEPARTMENT_ID == parentId2 && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.DEPARTMENT_ID == parentId2 && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 5)
{
departIds = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
if (user != null)
{
userId = user.ID;
}
else
{
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
}
}
}
var requre = this.GetEntity<T_SK_EVALUATION>(t => !t.IS_DELETED);
@ -13377,36 +13426,38 @@ namespace APT.BaseData.Services.DomainServices
result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID;
result.ISCOMPANY = entity.ISCOMPANY;
var resultIds = results.Select(t => t.ID).ToList();
var details = GetEntities<T_SK_RISK_EVALUATION_DETAIL>(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts");
var detailList = details.GroupBy(m => new { m.AREA_ID,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID });
var details = GetEntities<T_SK_RISK_EVALUATION_DETAIL>(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts");
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID }).Select(g => g.FirstOrDefault());
if (detailList.Any())
{
foreach (var de in detailList)
{
var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
T_SK_RISK_EVALUATION_SUMMARY_DETAIL detail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
detail.ORG_ID = entity.ORG_ID;
detail.RISK_EVALUATION_SUMMARY_ID = result.ID;
detail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
detail.AREA_ID = de.Key.AREA_ID;
detail.RISK_NAME = de.Key.RISK_NAME;
detail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION;
detail.TYPE_ID = de.Key.TYPE_ID;
detail.EVALUATE_L = temp.EVALUATE_L;
detail.EVALUATE_E = temp.EVALUATE_E;
detail.EVALUATE_C = temp.EVALUATE_C;
detail.SCOREC_ID = temp?.SCOREC_ID;
detail.SCOREE_ID = temp?.SCOREE_ID;
detail.SCOREL_ID = temp?.SCOREL_ID;
detail.EVALUATE_SCORE = temp.EVALUATE_SCORE;
detail.EMERGENCY = temp.EMERGENCY;
detail.EVALUATE_LEVEL = temp.EVALUATE_LEVEL;
detail.MARK = temp == null ? SKMarkEnum.Add : temp.MARK;
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL detail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
detail.ORG_ID = entity.ORG_ID;
detail.RISK_EVALUATION_SUMMARY_ID = result.ID;
detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID;
detail.MineType = de.MineType;
detail.AREA_ID = de.AREA_ID;
detail.RISK_NAME = de.RISK_NAME;
detail.RISK_NAME_ID = de.RISK_NAME_ID;
detail.RISK_DESCRIPTION = de.RISK_DESCRIPTION;
detail.TYPE_ID = de.TYPE_ID;
detail.EVALUATE_L = de.EVALUATE_L;
detail.EVALUATE_E = de.EVALUATE_E;
detail.EVALUATE_C = de.EVALUATE_C;
detail.SCOREC_ID = de.SCOREC_ID;
detail.SCOREE_ID = de.SCOREE_ID;
detail.SCOREL_ID = de.SCOREL_ID;
detail.EVALUATE_SCORE = de.EVALUATE_SCORE;
detail.EMERGENCY = de.EMERGENCY;
detail.EVALUATE_LEVEL = de.EVALUATE_LEVEL;
detail.MARK = de.MARK;
detail.MEASURE = de.MEASURE;
resultDetails.Add(detail);
if (temp.Nav_DetailMeasures != null && temp.Nav_DetailMeasures.Any())
if (de.Nav_DetailMeasures != null && de.Nav_DetailMeasures.Any())
{
var i = 1;
foreach (var item in temp.Nav_DetailMeasures.OrderBy(t => t.NUM))
foreach (var item in de.Nav_DetailMeasures.OrderBy(t => t.NUM))
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE();
dep.MEASURES_NAME = item.MEASURES_NAME;
@ -13420,12 +13471,12 @@ namespace APT.BaseData.Services.DomainServices
//var emergencyTemp = i + "、" + item.EMERGENCY + "；";
//detail.EMERGENCY = detail.EMERGENCY + emergencyTemp;
i++;
}
}
if (temp.Nav_DetailDeparts != null && temp.Nav_DetailDeparts.Any())
}
}
if (de.Nav_DetailDeparts != null && de.Nav_DetailDeparts.Any())
{
var i = 1;
foreach (var item in temp.Nav_DetailDeparts.OrderBy(m => m.DEPARTMENT_TYPE))
foreach (var item in de.Nav_DetailDeparts.OrderBy(m => m.DEPARTMENT_TYPE))
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART dep = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART();
dep.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE;
@ -13449,7 +13500,7 @@ namespace APT.BaseData.Services.DomainServices
}
var param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype == 5 || (dminetype == 10 && result.ISCOMPANY == SKIsStoreEnum.Yes))
if (dminetype == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes)
{
param = "公司级";
}

129669
APT.Data.Migrations/Migrations/20251021064221_hmr2025102101.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

374
APT.Data.Migrations/Migrations/20251021064221_hmr2025102101.cs Normal file
View File

@ -0,0 +1,374 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102101 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IDENTIFY_EVALUATION_PLAN_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_T_SK_IDENTIFY_EVALUATION_PLAN_IDENTIFY_EVALUATION_PLAN_ID",
column: x => x.IDENTIFY_EVALUATION_PLAN_ID,
principalTable: "T_SK_IDENTIFY_EVALUATION_PLAN",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_RISK_EVALUATION_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_REQUIRE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_REQUIRE_T_SK_EVALUATION_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_REQUIRE_T_SK_RISK_EVALUATION_RISK_EVALUATION_ID",
column: x => x.RISK_EVALUATION_ID,
principalTable: "T_SK_RISK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_SUMMARY_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_T_SK_EVALUATION_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_T_SK_RISK_EVALUATION_SUMMARY_RISK_EVALUATION_SUMMARY_ID",
column: x => x.RISK_EVALUATION_SUMMARY_ID,
principalTable: "T_SK_RISK_EVALUATION_SUMMARY",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_IDENTIFY_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_IDENTIFY_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_RISK_IDENTIFY_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_REQUIRE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_REQUIRE_T_SK_RISK_IDENTIFY_RISK_IDENTIFY_ID",
column: x => x.RISK_IDENTIFY_ID,
principalTable: "T_SK_RISK_IDENTIFY",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_IDENTIFY_RESULT_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_RISK_IDENTIFY_RESULT_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_T_SK_RISK_IDENTIFY_RESULT_RISK_IDENTIFY_RESULT_ID",
column: x => x.RISK_IDENTIFY_RESULT_ID,
principalTable: "T_SK_RISK_IDENTIFY_RESULT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IDENTIFY_RESULT_SUMMARY_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_IDENTIFY_RESULT_SUMMARY_ID",
column: x => x.IDENTIFY_RESULT_SUMMARY_ID,
principalTable: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_IDENTIFY_EVALUATION_PLAN_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
column: "IDENTIFY_EVALUATION_PLAN_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_ORG_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_REQUIRE_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_REQUIRE_ORG_ID",
table: "T_SK_RISK_EVALUATION_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_EVALUATION_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_REQUIRE_RISK_EVALUATION_ID",
table: "T_SK_RISK_EVALUATION_REQUIRE",
column: "RISK_EVALUATION_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_ORG_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_RISK_EVALUATION_SUMMARY_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
column: "RISK_EVALUATION_SUMMARY_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_REQUIRE_ORG_ID",
table: "T_SK_RISK_IDENTIFY_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_IDENTIFY_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_REQUIRE_RISK_IDENTIFY_ID",
table: "T_SK_RISK_IDENTIFY_REQUIRE",
column: "RISK_IDENTIFY_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_ORG_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_RISK_IDENTIFY_RESULT_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
column: "RISK_IDENTIFY_RESULT_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_IDENTIFY_RESULT_SUMMARY_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
column: "IDENTIFY_RESULT_SUMMARY_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_ORG_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
column: "REQUIRE_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_IDENTIFY_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE");
}
}
}

510
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -77665,6 +77665,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_IDENTIFY_EVALUATION_PLAN_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("IDENTIFY_EVALUATION_PLAN_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("REQUIRE_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("IDENTIFY_EVALUATION_PLAN_ID");
b.HasIndex("ORG_ID");
b.HasIndex("REQUIRE_ID");
b.ToTable("T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_LIBRARY_IMPORT_MAIN", b =>
{
b.Property<Guid>("ID")
@ -79346,6 +79403,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_RISK_EVALUATION_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_REQUIRE", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("REQUIRE_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_EVALUATION_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ORG_ID");
b.HasIndex("REQUIRE_ID");
b.HasIndex("RISK_EVALUATION_ID");
b.ToTable("T_SK_RISK_EVALUATION_REQUIRE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY", b =>
{
b.Property<Guid>("ID")
@ -79818,6 +79932,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_REQUIRE", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("REQUIRE_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_EVALUATION_SUMMARY_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ORG_ID");
b.HasIndex("REQUIRE_ID");
b.HasIndex("RISK_EVALUATION_SUMMARY_ID");
b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_REQUIRE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY", b =>
{
b.Property<Guid>("ID")
@ -80319,6 +80490,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_RISK_IDENTIFY_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_REQUIRE", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("REQUIRE_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_IDENTIFY_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ORG_ID");
b.HasIndex("REQUIRE_ID");
b.HasIndex("RISK_IDENTIFY_ID");
b.ToTable("T_SK_RISK_IDENTIFY_REQUIRE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT", b =>
{
b.Property<Guid>("ID")
@ -80591,6 +80819,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_RISK_IDENTIFY_RESULT_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_REQUIRE", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("REQUIRE_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_IDENTIFY_RESULT_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ORG_ID");
b.HasIndex("REQUIRE_ID");
b.HasIndex("RISK_IDENTIFY_RESULT_ID");
b.ToTable("T_SK_RISK_IDENTIFY_RESULT_REQUIRE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_SUMMARY", b =>
{
b.Property<Guid>("ID")
@ -81051,6 +81336,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("IDENTIFY_RESULT_SUMMARY_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("REQUIRE_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("IDENTIFY_RESULT_SUMMARY_ID");
b.HasIndex("ORG_ID");
b.HasIndex("REQUIRE_ID");
b.ToTable("T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_NAME", b =>
{
b.Property<Guid>("ID")
@ -120372,6 +120714,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Plan");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", "Nav_Plan")
.WithMany("Nav_Requires")
.HasForeignKey("IDENTIFY_EVALUATION_PLAN_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_REQUEST", "Nav_Require")
.WithMany()
.HasForeignKey("REQUIRE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Org");
b.Navigation("Nav_Plan");
b.Navigation("Nav_Require");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_LIBRARY_IMPORT_MAIN", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
@ -120819,6 +121187,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_REQUIRE", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_EVALUATION", "Nav_Require")
.WithMany()
.HasForeignKey("REQUIRE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION", "Nav_Evaluation")
.WithMany("Nav_Requires")
.HasForeignKey("RISK_EVALUATION_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Evaluation");
b.Navigation("Nav_Org");
b.Navigation("Nav_Require");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_ApplyDepartment")
@ -121031,6 +121425,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_REQUIRE", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_EVALUATION", "Nav_Require")
.WithMany()
.HasForeignKey("REQUIRE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY", "Nav_Evaluation")
.WithMany("Nav_Requires")
.HasForeignKey("RISK_EVALUATION_SUMMARY_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Evaluation");
b.Navigation("Nav_Org");
b.Navigation("Nav_Require");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_ApplyDepartment")
@ -121234,6 +121654,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_REQUIRE", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_REQUEST", "Nav_Require")
.WithMany()
.HasForeignKey("REQUIRE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY", "Nav_Identify")
.WithMany("Nav_Requires")
.HasForeignKey("RISK_IDENTIFY_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Identify");
b.Navigation("Nav_Org");
b.Navigation("Nav_Require");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_ApplyDepartment")
@ -121354,6 +121800,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_REQUIRE", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_REQUEST", "Nav_Require")
.WithMany()
.HasForeignKey("REQUIRE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT", "Nav_IdentifyResult")
.WithMany("Nav_Requires")
.HasForeignKey("RISK_IDENTIFY_RESULT_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_IdentifyResult");
b.Navigation("Nav_Org");
b.Navigation("Nav_Require");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_SUMMARY", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_ApplyDepartment")
@ -121552,6 +122024,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_SummaryDetail");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_SUMMARY", "Nav_IdentifySummary")
.WithMany("Nav_Requires")
.HasForeignKey("IDENTIFY_RESULT_SUMMARY_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_REQUEST", "Nav_Require")
.WithMany()
.HasForeignKey("REQUIRE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_IdentifySummary");
b.Navigation("Nav_Org");
b.Navigation("Nav_Require");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_NAME", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
@ -128661,6 +129159,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Details");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL", b =>
@ -128689,6 +129189,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Details");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL", b =>
@ -128705,6 +129207,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Details");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL", b =>
@ -128721,6 +129225,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Details");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_DETAIL", b =>
@ -128733,6 +129239,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Details");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_DETAIL", b =>
@ -128749,6 +129257,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Details");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL", b =>

66
APT.MS.Data/Mapping/T4/T4Map.cs
View File

@ -13303,6 +13303,17 @@ builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelet
builder.HasOne(t => t.Nav_Plan).WithMany(t=>t.Nav_Files).HasForeignKey(t => t.IDENTIFY_EVALUATION_PLAN_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region IdentifyEvaluationPlanRequire
public partial class SKIdentifyEvaluationPlanRequireMap :APTEntityBaseMap<T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE>
{
public override void Configure(EntityTypeBuilder<T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Plan).WithMany(t=>t.Nav_Requires).HasForeignKey(t => t.IDENTIFY_EVALUATION_PLAN_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Require).WithMany().HasForeignKey(t => t.REQUIRE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region LibraryImportMain
@ -13637,6 +13648,17 @@ builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelet
builder.HasOne(t => t.Nav_Evaluation).WithMany(t=>t.Nav_Files).HasForeignKey(t => t.RISK_EVALUATION_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskEvaluationRequire
public partial class SKRiskEvaluationRequireMap :APTEntityBaseMap<T_SK_RISK_EVALUATION_REQUIRE>
{
public override void Configure(EntityTypeBuilder<T_SK_RISK_EVALUATION_REQUIRE> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Evaluation).WithMany(t=>t.Nav_Requires).HasForeignKey(t => t.RISK_EVALUATION_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Require).WithMany().HasForeignKey(t => t.REQUIRE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskEvaluationSummary
@ -13725,6 +13747,17 @@ builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelet
builder.HasOne(t => t.Nav_Evaluation).WithMany(t=>t.Nav_Files).HasForeignKey(t => t.RISK_EVALUATION_SUMMARY_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskEvaluationSummaryRequire
public partial class SKRiskEvaluationSummaryRequireMap :APTEntityBaseMap<T_SK_RISK_EVALUATION_SUMMARY_REQUIRE>
{
public override void Configure(EntityTypeBuilder<T_SK_RISK_EVALUATION_SUMMARY_REQUIRE> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Evaluation).WithMany(t=>t.Nav_Requires).HasForeignKey(t => t.RISK_EVALUATION_SUMMARY_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Require).WithMany().HasForeignKey(t => t.REQUIRE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskIdentify
@ -13819,6 +13852,17 @@ builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelet
builder.HasOne(t => t.Nav_Identify).WithMany(t=>t.Nav_Files).HasForeignKey(t => t.RISK_IDENTIFY_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskIdentifyRequire
public partial class SKRiskIdentifyRequireMap :APTEntityBaseMap<T_SK_RISK_IDENTIFY_REQUIRE>
{
public override void Configure(EntityTypeBuilder<T_SK_RISK_IDENTIFY_REQUIRE> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Identify).WithMany(t=>t.Nav_Requires).HasForeignKey(t => t.RISK_IDENTIFY_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Require).WithMany().HasForeignKey(t => t.REQUIRE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskIdentifyResult
@ -13871,6 +13915,17 @@ builder.Property(t => t.IDENTIFY_POST).HasMaxLength(500);
builder.HasOne(t => t.Nav_IdentifyResult).WithMany(t=>t.Nav_Files).HasForeignKey(t => t.RISK_IDENTIFY_RESULT_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskIdentifyResultRequire
public partial class SKRiskIdentifyResultRequireMap :APTEntityBaseMap<T_SK_RISK_IDENTIFY_RESULT_REQUIRE>
{
public override void Configure(EntityTypeBuilder<T_SK_RISK_IDENTIFY_RESULT_REQUIRE> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_IdentifyResult).WithMany(t=>t.Nav_Requires).HasForeignKey(t => t.RISK_IDENTIFY_RESULT_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Require).WithMany().HasForeignKey(t => t.REQUIRE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskIdentifyResultSummary
@ -13958,6 +14013,17 @@ builder.Property(t => t.EMERGENCY).HasMaxLength(500);
builder.HasOne(t => t.Nav_SummaryDetail).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskIdentifyResultSummaryRequire
public partial class SKRiskIdentifyResultSummaryRequireMap :APTEntityBaseMap<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE>
{
public override void Configure(EntityTypeBuilder<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_IdentifySummary).WithMany(t=>t.Nav_Requires).HasForeignKey(t => t.IDENTIFY_RESULT_SUMMARY_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Require).WithMany().HasForeignKey(t => t.REQUIRE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskName

5
APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN.cs
View File

@ -84,6 +84,9 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
[Description("导航：辨识要求表")]
public virtual ICollection<T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE> Nav_Requires { get; set; }
}
}

32
APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE.cs Normal file
View File

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("辨识要求表")]
public class T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE : MesEntityBase
{
/// <summary>
/// 辨识评估计划
/// </summary>
[Description("辨识评估计划")]
[DataFieldForeignKey("Nav_Plan", "Nav_Requires")]
public Guid IDENTIFY_EVALUATION_PLAN_ID { get; set; }
/// <summary>
/// 导航：辨识评估计划
/// </summary>
[Description("导航：辨识评估计划")]
public virtual T_SK_IDENTIFY_EVALUATION_PLAN Nav_Plan { get; set; }
[Description("辨识要求")]
[DataFieldForeignKey("Nav_Require")]
public Guid? REQUIRE_ID { get; set; }
[Description("导航属性：辨识要求")]
public virtual T_SK_REQUEST Nav_Require { get; set; }
}
}

5
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION.cs
View File

@ -57,7 +57,10 @@ namespace APT.MS.Domain.Entities.SK
/// 检查附件表
/// </summary>
[Description("导航：检查附件表")]
public virtual ICollection<T_SK_RISK_EVALUATION_FILE> Nav_Files { get; set; }
public virtual ICollection<T_SK_RISK_EVALUATION_FILE> Nav_Files { get; set; }
[Description("导航：评价要求")]
public virtual ICollection<T_SK_RISK_EVALUATION_REQUIRE> Nav_Requires { get; set; }
[Description("状态")]
[EnumName("PFStandardStatus")]

32
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_REQUIRE.cs Normal file
View File

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航属性：评价要求")]
public class T_SK_RISK_EVALUATION_REQUIRE : MesEntityBase
{
/// <summary>
/// 安全风险评估表
/// </summary>
[Description("安全风险评估表")]
[DataFieldForeignKey("Nav_Evaluation", "Nav_Requires")]
public Guid RISK_EVALUATION_ID { get; set; }
/// <summary>
/// 导航：安全风险评估表
/// </summary>
[Description("导航：安全风险评估表")]
public virtual T_SK_RISK_EVALUATION Nav_Evaluation { get; set; }
[Description("评价要求")]
[DataFieldForeignKey("Nav_Require")]
public Guid? REQUIRE_ID { get; set; }
[Description("导航属性：评价要求")]
public virtual T_SK_EVALUATION Nav_Require { get; set; }
}
}

5
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY.cs
View File

@ -57,7 +57,10 @@ namespace APT.MS.Domain.Entities.SK
/// 检查附件表
/// </summary>
[Description("导航：检查附件表")]
public virtual ICollection<T_SK_RISK_EVALUATION_SUMMARY_FILE> Nav_Files { get; set; }
public virtual ICollection<T_SK_RISK_EVALUATION_SUMMARY_FILE> Nav_Files { get; set; }
[Description("导航：评价要求")]
public virtual ICollection<T_SK_RISK_EVALUATION_SUMMARY_REQUIRE> Nav_Requires { get; set; }
[Description("状态")]
[EnumName("PFStandardStatus")]

31
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_REQUIRE.cs Normal file
View File

@ -0,0 +1,31 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航属性：评价要求")]
public class T_SK_RISK_EVALUATION_SUMMARY_REQUIRE : MesEntityBase
{
/// <summary>
/// 安全风险评估汇总表
/// </summary>
[Description("安全风险评估汇总表")]
[DataFieldForeignKey("Nav_Evaluation", "Nav_Requires")]
public Guid RISK_EVALUATION_SUMMARY_ID { get; set; }
/// <summary>
/// 导航：安全风险评估汇总表
/// </summary>
[Description("导航：安全风险评估汇总表")]
public virtual T_SK_RISK_EVALUATION_SUMMARY Nav_Evaluation { get; set; }
[Description("评价要求")]
[DataFieldForeignKey("Nav_Require")]
public Guid? REQUIRE_ID { get; set; }
[Description("导航属性：评价要求")]
public virtual T_SK_EVALUATION Nav_Require { get; set; }
}
}

5
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY.cs
View File

@ -60,7 +60,10 @@ namespace APT.MS.Domain.Entities.SK
/// 检查附件表
/// </summary>
[Description("导航：检查附件表")]
public virtual ICollection<T_SK_RISK_IDENTIFY_FILE> Nav_Files { get; set; }
public virtual ICollection<T_SK_RISK_IDENTIFY_FILE> Nav_Files { get; set; }
[Description("导航：辨识要求表")]
public virtual ICollection<T_SK_RISK_IDENTIFY_REQUIRE> Nav_Requires { get; set; }
[Description("状态")]
[EnumName("PFStandardStatus")]

32
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_REQUIRE.cs Normal file
View File

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("辨识要求表")]
public class T_SK_RISK_IDENTIFY_REQUIRE : MesEntityBase
{
/// <summary>
/// 安全风险辨识
/// </summary>
[Description("安全风险辨识")]
[DataFieldForeignKey("Nav_Identify", "Nav_Requires")]
public Guid RISK_IDENTIFY_ID { get; set; }
/// <summary>
/// 导航：安全风险辨识
/// </summary>
[Description("导航：安全风险辨识")]
public virtual T_SK_RISK_IDENTIFY Nav_Identify { get; set; }
[Description("辨识要求")]
[DataFieldForeignKey("Nav_Require")]
public Guid? REQUIRE_ID { get; set; }
[Description("导航属性：辨识要求")]
public virtual T_SK_REQUEST Nav_Require { get; set; }
}
}

5
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT.cs
View File

@ -68,7 +68,10 @@ namespace APT.MS.Domain.Entities.SK
/// 检查附件表
/// </summary>
[Description("导航：检查附件表")]
public virtual ICollection<T_SK_RISK_IDENTIFY_RESULT_FILE> Nav_Files { get; set; }
public virtual ICollection<T_SK_RISK_IDENTIFY_RESULT_FILE> Nav_Files { get; set; }
[Description("导航：辨识要求表")]
public virtual ICollection<T_SK_RISK_IDENTIFY_RESULT_REQUIRE> Nav_Requires { get; set; }
[Description("状态")]
[EnumName("PFStandardStatus")]

32
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_REQUIRE.cs Normal file
View File

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("辨识要求表")]
public class T_SK_RISK_IDENTIFY_RESULT_REQUIRE : MesEntityBase
{
/// <summary>
/// 安全风险辨识结果
/// </summary>
[Description("安全风险辨识结果")]
[DataFieldForeignKey("Nav_IdentifyResult", "Nav_Requires")]
public Guid RISK_IDENTIFY_RESULT_ID { get; set; }
/// <summary>
/// 导航：安全风险辨识结果
/// </summary>
[Description("导航：安全风险辨识结果")]
public virtual T_SK_RISK_IDENTIFY_RESULT Nav_IdentifyResult { get; set; }
[Description("辨识要求")]
[DataFieldForeignKey("Nav_Require")]
public Guid? REQUIRE_ID { get; set; }
[Description("导航属性：辨识要求")]
public virtual T_SK_REQUEST Nav_Require { get; set; }
}
}

5
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY.cs
View File

@ -71,7 +71,10 @@ namespace APT.MS.Domain.Entities.SK
/// 检查附件表
/// </summary>
[Description("导航：检查附件表")]
public virtual ICollection<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_FILE> Nav_Files { get; set; }
public virtual ICollection<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_FILE> Nav_Files { get; set; }
[Description("导航：辨识要求表")]
public virtual ICollection<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE> Nav_Requires { get; set; }
[Description("状态")]
[EnumName("PFStandardStatus")]

32
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE.cs Normal file
View File

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("辨识要求表")]
public class T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE : MesEntityBase
{
/// <summary>
/// 安全风险辨识结果汇总
/// </summary>
[Description("安全风险辨识结果汇总")]
[DataFieldForeignKey("Nav_IdentifySummary", "Nav_Requires")]
public Guid IDENTIFY_RESULT_SUMMARY_ID { get; set; }
/// <summary>
/// 导航：安全风险辨识结果汇总
/// </summary>
[Description("导航：安全风险辨识结果汇总")]
public virtual T_SK_RISK_IDENTIFY_RESULT_SUMMARY Nav_IdentifySummary { get; set; }
[Description("辨识要求")]
[DataFieldForeignKey("Nav_Require")]
public Guid? REQUIRE_ID { get; set; }
[Description("导航属性：辨识要求")]
public virtual T_SK_REQUEST Nav_Require { get; set; }
}
}

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

@ -1151,7 +1151,11 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
var endtime = plan.END_DATE != null ? (DateTime)plan.END_DATE : DateTime.Now.AddDays(1);
var endtime = DateTime.Now.AddHours(24);
if (plan.END_DATE != null)
{
endtime = Convert.ToDateTime(plan.END_DATE.ToString().Replace("0:00:00", "23:59:59"));
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033");
notices.Add(noticeTask);
}
@ -1401,7 +1405,11 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
var endtime = plan.END_DATE != null ? (DateTime)plan.END_DATE : DateTime.Now.AddDays(1);
var endtime = DateTime.Now.AddHours(24);
if (plan.END_DATE != null)
{
endtime = Convert.ToDateTime(plan.END_DATE.ToString().Replace("0:00:00", "23:59:59"));
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033");
notices.Add(noticeTask);
//}
@ -1501,7 +1509,7 @@ namespace APT.PP.WebApi.Controllers.Api
//公司默认职能部门
var company = departs.FirstOrDefault(t => t.PARENT_ID == null);
departListIds.Add(company.ID);
var tempids = departs.Where(t => t.DEPARTMENT_STATUS == 0).Select(m => m.ID).ToList();
var tempids = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
departListIds.AddRange(tempids);
//职能口统一汇总给安环部安全员
if (departListIds.Any())
@ -1533,34 +1541,31 @@ namespace APT.PP.WebApi.Controllers.Api
result.END_DATE = DateTime.Now;
result.REQUIRE_ID = requre?.ID;
results.Add(result);
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m =>m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
//只取有效的部门岗位
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.Key.TYPE_ID;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE;
ideDetail.EMERGENCY = tempYes != null ? tempYes.EMERGENCY : temp[0]?.EMERGENCY;
ideDetail.ENABLE_STATUS = tempYes != null ? tempYes.ENABLE_STATUS : temp[0].ENABLE_STATUS;
{
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.AREA_ID;
ideDetail.RISK_NAME = item.RISK_NAME;
ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.MEASURE = item.MEASURE;
ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
if (departIdss.Any())
{
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).Select(m => m.DEPARTMENT_TYPE).Distinct().ToList();
@ -1570,15 +1575,15 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var ite in departTemps)
{
var departType = "公司级";
if (ite == 0)
if (ite == 10)
{
departType = "部门级";
}
if (ite == 1)
if (ite == 15)
{
departType = "车间级";
}
if (ite == 2)
if (ite == 20)
{
departType = "班组级";
}
@ -1664,34 +1669,31 @@ namespace APT.PP.WebApi.Controllers.Api
results.Add(result);
//只汇总部门级所有人的明细
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
//只取有效的部门岗位
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.Key.TYPE_ID;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE;
ideDetail.EMERGENCY = tempYes != null ? tempYes.EMERGENCY : temp[0]?.EMERGENCY;
ideDetail.ENABLE_STATUS = tempYes != null ? tempYes.ENABLE_STATUS : temp[0].ENABLE_STATUS;
{
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.AREA_ID;
ideDetail.RISK_NAME = item.RISK_NAME;
ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.MEASURE = item.MEASURE;
ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//ideDetail.DEPARTMENT_TYPE = "岗位级";
if (departIdss.Any())
{
@ -1702,15 +1704,15 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var ite in departTemps)
{
var departType = "公司级";
if (ite == 0)
if (ite == 10)
{
departType = "部门级";
}
if (ite == 1)
if (ite == 15)
{
departType = "车间级";
}
if (ite == 2)
if (ite == 20)
{
departType = "班组级";
}
@ -1801,34 +1803,31 @@ namespace APT.PP.WebApi.Controllers.Api
result.REQUIRE_ID = requre?.ID;
results.Add(result);
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de || classIds.Contains((Guid)m.APPLY_DEPARTMENT_ID)).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
//只取有效的部门岗位
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.Key.TYPE_ID;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE;
ideDetail.EMERGENCY = tempYes != null ? tempYes.EMERGENCY : temp[0]?.EMERGENCY;
ideDetail.ENABLE_STATUS = tempYes != null ? tempYes.ENABLE_STATUS : temp[0].ENABLE_STATUS;
{
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.MineType;
ideDetail.AREA_ID = item.AREA_ID;
ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
ideDetail.RISK_NAME = item.RISK_NAME;
ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.MEASURE = item.MEASURE;
ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//ideDetail.DEPARTMENT_TYPE = "岗位级";
if (departIdss.Any())
{
@ -1839,15 +1838,15 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var ite in departTemps)
{
var departType = "公司级";
if (ite == 0)
if (ite == 10)
{
departType = "部门级";
}
if (ite == 1)
if (ite == 15)
{
departType = "车间级";
}
if (ite == 2)
if (ite == 20)
{
departType = "班组级";
}
@ -4927,13 +4926,13 @@ namespace APT.PP.WebApi.Controllers.Api
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> detailContents = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
if (setList != null && setList.Any())
{
var proMinetypes = this.GetEntities<T_FM_USER_PRODUCTION_UNIT_SET>(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId));
var checkTypes = this.GetEntities<T_SK_CHECK_TYPE>(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId));
var checkTypeIds = checkTypes.Where(t => t.NAME == "岗位排查").Select(m => m.ID).ToList();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID != null && !t.CODE.Contains("admin") && t.Nav_Person != null, new BaseFilter(filter.OrgId), "Nav_Person", "Nav_ApproveRole");
var checkCycles = setList.Select(t => t.CHECK_CYCLE).Distinct().ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").ToList();
var productions = this.GetEntities<T_FM_USER_PRODUCTION_UNIT_SET>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_ProductionUnit").ToList();
var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
@ -4964,6 +4963,7 @@ namespace APT.PP.WebApi.Controllers.Api
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = post?.NAME;
de.MineType = item.MineType;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
@ -4984,6 +4984,7 @@ namespace APT.PP.WebApi.Controllers.Api
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = "未配置辨识岗位";
de.MineType = item.MineType;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
@ -5049,7 +5050,7 @@ namespace APT.PP.WebApi.Controllers.Api
listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
listNew.Cycle = item.Key.CHECK_CYCLE;
listNew.DepartType = item.Key.CHECK_TYPE;
listNew.MineType = proMinetypes.FirstOrDefault(t=>t.ID == item.Key.PRODUCTION_UNIT_ID)?.NAME;
listNew.MineType = productions.FirstOrDefault(t=>t.ID == item.Key.PRODUCTION_UNIT_ID)?.NAME;
listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
@ -5076,7 +5077,7 @@ namespace APT.PP.WebApi.Controllers.Api
checkListDetail.CHECKSTANDARD = tem.CHECK_STANDARD;
listDetail.Add(checkListDetail);
}
listNew.details = listDetail.Where(n=>n.CHECK_CONTENTS_ID!=null).OrderBy(t => t.RISK_AREA_NAME).ThenBy(m => m.RISK_NAME).ToList();
listNew.details = listDetail.Where(n => n.CHECK_CONTENTS_ID != null).OrderBy(t => t.RISK_AREA_NAME).ThenBy(m => m.RISK_NAME).ToList();
}
list.Add(listNew);
}
@ -5087,7 +5088,7 @@ namespace APT.PP.WebApi.Controllers.Api
{
dt = DateTime.Parse(filter.Parameter1);
}
DateTime minTime = dt.AddMinutes(0);
DateTime minTime = dt.AddMinutes(-10);
DateTime maxTime = dt.AddMinutes(60);
var shiftClassList = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(s => s.START_TIME > minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME && s.Nav_Team.ENABLE_STATUS == 0 && s.TEAM_ID != null, new BaseFilter(filter.OrgId), "Nav_DepartmentSchedulingDetail.Nav_Person").ToList();
var teamIds = shiftClassList.Select(t => t.TEAM_ID).Distinct().ToList();
@ -5107,11 +5108,11 @@ namespace APT.PP.WebApi.Controllers.Api
}
var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "MineType", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE" }; //指定字段，包括导航属性
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CREATE_TIME > minTime && i.CREATE_TIME <= maxTime;
baseFilter.SelectField = new string[] { "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE", "CREATE_TIME" }; //指定字段，包括导航属性
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && (i.CREATE_TIME.Value.Date == DateTime.Now.Date || i.CREATE_TIME.Value.Date == DateTime.Now.AddDays(-1).Date);
List<T_SK_SECURITY_INSPECTION_NOTICE> noticeExsiss = this.GetOrderEntities(expression, baseFilter).ToList();
baseFilter.SelectField = new string[] { "MineType", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE" };
Expression<Func<T_SK_SECURITY_INSPECTION_RECORD, bool>> expressionR = i => i.IS_DELETED == false && i.CREATE_TIME > minTime && i.CREATE_TIME <= maxTime;
baseFilter.SelectField = new string[] { "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE", "CREATE_TIME" };
Expression<Func<T_SK_SECURITY_INSPECTION_RECORD, bool>> expressionR = i => i.IS_DELETED == false && (i.CREATE_TIME.Value.Date == DateTime.Now.Date || i.CREATE_TIME.Value.Date == DateTime.Now.AddDays(-1).Date);
List<T_SK_SECURITY_INSPECTION_RECORD> recordExsiss = this.GetOrderEntities(expressionR, baseFilter).ToList();
//取岗位排查表
var postCheckList = list.Where(t => t.CheckTypeId != null && checkTypeIds.Contains((Guid)t.CheckTypeId)).ToList();
@ -5119,77 +5120,89 @@ namespace APT.PP.WebApi.Controllers.Api
{
foreach (var item in postCheckList)
{
//取排班
var teamFirst = teamInfos.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId);
var sche = shiftClassList.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID);
//触发安全检查记录给对应的岗位工(有排班才触发)
var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID) && t.Nav_Person != null && t.Nav_Person.POST_ID == item.CheckPostId);
if (userInfo != null)
var userInfo = users.Where(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID) && t.Nav_Person != null && t.Nav_Person.POST_ID == item.CheckPostId).ToList();
if (userInfo != null && userInfo.Any())
{
//判断是否重复触发
var exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle);
if (exist == null)
foreach (var user in userInfo)
{
T_SK_SECURITY_INSPECTION_RECORD record = new T_SK_SECURITY_INSPECTION_RECORD();
record.ORG_ID = filter.OrgId;
record.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
record.APPLY_USER_ID = userInfo.ID;
record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.CHECK_TYPE_ID = item.CheckTypeId;
record.PLANCHECKFREQUENCY = item.Cycle;
record.DEPARTMENT_TYPE = item.DepartType;
record.STATUS = PFStandardStatus.Draft;
record.ISAUTO = true;
records.Add(record);
if (item.details != null && item.details.Any())
//判断是否重复触发
var exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == user.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME.Value.Date == dt.Date);
//如果是大夜班，跨天的情况下再判断一次，如果存在，就表示今天已触发，只是创建日期是昨天
if (exist == null && sche != null && sche.START_TIME.AddHours(-1).Date != dt.Date)
{
foreach (var item2 in item.details)
var tempDate = sche.START_TIME.AddHours(-2);
exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == user.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME > tempDate);
}
if (exist == null)
{
T_SK_SECURITY_INSPECTION_RECORD record = new T_SK_SECURITY_INSPECTION_RECORD();
record.ORG_ID = filter.OrgId;
record.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
record.APPLY_USER_ID = user.ID;
record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.CHECK_TYPE_ID = item.CheckTypeId;
record.PLANCHECKFREQUENCY = item.Cycle;
record.DEPARTMENT_TYPE = item.DepartType;
record.STATUS = PFStandardStatus.Draft;
record.ISAUTO = true;
records.Add(record);
if (item.details != null && item.details.Any())
{
var i = 1;
//var repeat = safeDetialNotices.FirstOrDefault(t => t.SECURITY_INSPECTION_NOTICE_ID == safeNotice.ID && t.RISK_AREA_ID == item2.AREA_ID && t.CHECK_CONTENTS_ID == item2.CHECK_CONTENTS_ID);
//if (repeat == null)
foreach (var item2 in item.details)
{
T_SK_SECURITY_INSPECTION_RECORD_DETAIL detail = new T_SK_SECURITY_INSPECTION_RECORD_DETAIL();
detail.ORG_ID = filter.OrgId;
detail.SECURITY_INSPECTION_RECORD_ID = record.ID;
detail.RISK_AREA_ID = item2.RISK_AREA_ID;
detail.CHECK_CONTENTS_ID = item2.CHECK_CONTENTS_ID;
detail.CHECKCONTENT = item2.CHECK_CONTENTS_NAME;
detail.CHECKPROOF = item2.CHECKPROOF;
detail.CHECKSTANDARD = item2.CHECKSTANDARD;
detail.NUM = i;
recordDetails.Add(detail);
i++;
T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER deUser = new T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER();
deUser.ORG_ID = filter.OrgId;
deUser.SECURITY_INSPECTION_RECORD_DETAIL_ID = detail.ID;
deUser.USER_ID = userInfo.ID;
deUser.ISMAINCHECK = true;
recordDetailUsers.Add(deUser);
var i = 1;
//var repeat = safeDetialNotices.FirstOrDefault(t => t.SECURITY_INSPECTION_NOTICE_ID == safeNotice.ID && t.RISK_AREA_ID == item2.AREA_ID && t.CHECK_CONTENTS_ID == item2.CHECK_CONTENTS_ID);
//if (repeat == null)
{
T_SK_SECURITY_INSPECTION_RECORD_DETAIL detail = new T_SK_SECURITY_INSPECTION_RECORD_DETAIL();
detail.ORG_ID = filter.OrgId;
detail.SECURITY_INSPECTION_RECORD_ID = record.ID;
detail.RISK_AREA_ID = item2.RISK_AREA_ID;
detail.CHECK_CONTENTS_ID = item2.CHECK_CONTENTS_ID;
detail.CHECKCONTENT = item2.CHECK_CONTENTS_NAME;
detail.CHECKPROOF = item2.CHECKPROOF;
detail.CHECKSTANDARD = item2.CHECKSTANDARD;
detail.NUM = i;
recordDetails.Add(detail);
i++;
T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER deUser = new T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER();
deUser.ORG_ID = filter.OrgId;
deUser.SECURITY_INSPECTION_RECORD_DETAIL_ID = detail.ID;
deUser.USER_ID = user.ID;
deUser.ISMAINCHECK = true;
recordDetailUsers.Add(deUser);
}
}
}
var date = DateTime.Now.Year + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.AddHours(4).Day.PadLeft(2, '0');
var endtime = DateTime.Now.AddHours(24);
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Week)
{
endtime = DateTime.Now.AddDays(7);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Month)
{
endtime = DateTime.Now.AddMonths(1);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.HalfYear)
{
endtime = DateTime.Now.AddMonths(6);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Year)
{
endtime = DateTime.Now.AddMonths(12);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Quarter)
{
endtime = DateTime.Now.AddMonths(3);
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + "岗位排查记录" + date, record.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK010");
notices.Add(notice);
}
var date = DateTime.Now.Year + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0');
var endtime = DateTime.Now.AddHours(24);
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Week)
{
endtime = DateTime.Now.AddDays(7);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Month)
{
endtime = DateTime.Now.AddMonths(1);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.HalfYear)
{
endtime = DateTime.Now.AddMonths(6);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Year)
{
endtime = DateTime.Now.AddMonths(12);
}
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Quarter)
{
endtime = DateTime.Now.AddMonths(3);
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + "岗位排查记录" + date, record.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK010");
notices.Add(notice);
}
}
}
@ -5200,7 +5213,6 @@ namespace APT.PP.WebApi.Controllers.Api
{
foreach (var item in checkList)
{
var setTime = setList.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.CHECK_CYCLE == item.Cycle);
var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
//触发安全检查通知给对应的审批角色
if (item.CheckPost == "安环部安全员")
@ -5218,8 +5230,21 @@ namespace APT.PP.WebApi.Controllers.Api
}
if (userInfo != null)
{
var setTime = setList.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.CHECK_CYCLE == item.Cycle);
//判断是否重复触发
var exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle);
var exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME.Value.Date == dt.Date);
//如果是大夜班，跨天的情况下再判断一次，如果存在，就表示今天已触发，只是创建日期是昨天
if (exist == null && item.CheckPost == "班组负责人")
{
//取排班
var teamFirst = teamInfos.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId);
var sche = shiftClassList.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID);
if (sche != null && sche.START_TIME.AddHours(-1).Date != dt.Date)
{
var tempDate = sche.START_TIME.AddHours(-2);
exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME > tempDate);
}
}
if ((exist == null && item.CheckPost == "班组负责人") || (exist == null && item.CheckPost != "班组负责人" && setTime != null && dtNow.Hour == setTime.CHECKTIME.Value.Hour))
{
T_SK_SECURITY_INSPECTION_NOTICE safeNotice = new T_SK_SECURITY_INSPECTION_NOTICE();
@ -5254,7 +5279,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
var date = DateTime.Now.Year + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0');
var date = DateTime.Now.Year + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.AddHours(4).Day.PadLeft(2, '0');
var endtime = DateTime.Now.AddHours(24);
if (item.Cycle == SKPLANCHECKFREQUENCYEnum.Week)
{

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
View File

@ -313,13 +313,13 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var item2 in item.Nav_Details.OrderBy(t => t.NUM))
{
var i = 1;
//var i = 1;
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
{
detailStr.Add(item2.MEASURES_NAME);
var temp = i + "、" + item2.MEASURES_NAME + Environment.NewLine;
var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp;
i++;
//i++;
}
if (item2 != null && item2.Nav_DetailContents != null && item2.Nav_DetailContents.Any())
{

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

@ -630,6 +630,7 @@ namespace APT.SK.WebApi.Controllers.Api
pageFilter.Include.Add("Nav_RiskName");
pageFilter.Include.Add("Nav_Details");
pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.SelectField.Add("Nav_ProductionUnit.NAME");
pageFilter.SelectField.Add("Nav_Details.NUM");
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");

17
APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs
View File

@ -50,6 +50,8 @@ namespace APT.SK.WebApi.Controllers.Api
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
var requires = entity.Nav_Requires;
entity.Nav_Requires = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
if (entity.START_DATE.Value.Date < DateTime.Now.Date)
@ -99,6 +101,15 @@ namespace APT.SK.WebApi.Controllers.Api
item.Nav_ImgFile = null;
}
}
if (requires != null && requires.Any())
{
foreach (var item in requires)
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
item.Nav_Require = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
@ -129,6 +140,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
}, null, null, null, null, null, "SK031_SHOWPRINT", null, "安全风险辨识与评估计划审批");
@ -147,6 +160,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
});
@ -169,7 +184,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment",
"Nav_Files.Nav_ImgFile"});
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(t => t.IDENTIFY_EVALUATION_PLAN_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Department");

54
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -1,19 +1,21 @@
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.IServices.FM;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.IServices;
using APT.BaseData.Domain.IServices.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.SK;
using APT.MS.Domain.Enums;
using APT.MS.Domain.Enums.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using Microsoft.VisualStudio.Web.CodeGeneration.Utils;
using MySqlX.XDevAPI.Common;
using System.Linq;
using System.Collections.Generic;
using Newtonsoft.Json;
using System;
using APT.MS.Domain.Enums.SK;
using System.Collections.Generic;
using System.Linq;
namespace APT.SK.WebApi.Controllers.Api
{
@ -48,7 +50,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
var details = entity.Nav_Details;
entity.Nav_Details = null;
entity.Nav_Details = null;
var requires = entity.Nav_Requires;
entity.Nav_Requires = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
@ -70,18 +74,11 @@ namespace APT.SK.WebApi.Controllers.Api
deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details)
{
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
if (temp == null)
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
&& t.EMERGENCY == item.EMERGENCY);
if (temp == null && item.MARK != SKMarkEnum.Add)
{
item.MARK = SKMarkEnum.Add;
}
else
{
if (temp.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
|| temp.EMERGENCY != item.EMERGENCY))
{
item.MARK = SKMarkEnum.Update;
}
item.MARK = SKMarkEnum.Update;
}
}
//record.Nav_Details.ForEach(t =>
@ -178,10 +175,23 @@ namespace APT.SK.WebApi.Controllers.Api
item.RISK_EVALUATION_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (requires != null && requires.Any())
{
foreach (var item in requires)
{
item.ORG_ID = entity.ORG_ID;
item.RISK_EVALUATION_ID = entity.ID;
item.Nav_Require = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
if (departList.Where(t => t.IS_DELETED == false).Count() == 0)
{
throw new Exception("管控层级不能为空");
}
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
entity.STATUS = PFStandardStatus.Approving;
@ -208,6 +218,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -231,6 +243,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -254,7 +268,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_EVALUATION>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile"});
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL>(t => t.RISK_EVALUATION_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit");

23
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs
View File

@ -46,7 +46,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
var details = entity.Nav_Details;
entity.Nav_Details = null;
entity.Nav_Details = null;
var requires = entity.Nav_Requires;
entity.Nav_Requires = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
@ -101,6 +103,15 @@ namespace APT.SK.WebApi.Controllers.Api
item.Nav_ImgFile = null;
}
}
if (requires != null && requires.Any())
{
foreach (var item in requires)
{
item.ORG_ID = entity.ORG_ID;
item.RISK_EVALUATION_SUMMARY_ID = entity.ID;
item.Nav_Require = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
@ -119,7 +130,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -134,7 +147,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -160,7 +175,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_EVALUATION_SUMMARY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile"});
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit");

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

@ -49,7 +49,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
var details = entity.Nav_Details;
entity.Nav_Details = null;
entity.Nav_Details = null;
var requires = entity.Nav_Requires;
entity.Nav_Requires = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
@ -74,18 +76,11 @@ namespace APT.SK.WebApi.Controllers.Api
//});
foreach (var item in details)
{
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
if (temp == null)
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
&& t.EMERGENCY == item.EMERGENCY);
if (temp == null && item.MARK != SKMarkEnum.Add)
{
item.MARK = SKMarkEnum.Add;
}
else
{
if (temp.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
|| temp.EMERGENCY != item.EMERGENCY))
{
item.MARK = SKMarkEnum.Update;
}
item.MARK = SKMarkEnum.Update;
}
}
}
@ -115,6 +110,15 @@ namespace APT.SK.WebApi.Controllers.Api
item.RISK_IDENTIFY_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (requires != null && requires.Any())
{
foreach (var item in requires)
{
item.ORG_ID = entity.ORG_ID;
item.RISK_IDENTIFY_ID = entity.ID;
item.Nav_Require = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
@ -144,7 +148,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
}, null, null, null, null, null, "SK033_SHOWPRINT", null, "安全风险辨识表审批");
@ -161,7 +167,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
});
@ -209,7 +217,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_IDENTIFY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile"});
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");

52
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -1,18 +1,20 @@
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.IServices.FM;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.IServices;
using APT.BaseData.Domain.IServices.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.SK;
using APT.MS.Domain.Enums;
using APT.MS.Domain.Enums.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using APT.MS.Domain.Enums.SK;
using Microsoft.VisualStudio.Web.CodeGeneration.Utils;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
namespace APT.SK.WebApi.Controllers.Api
@ -48,7 +50,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_RISK_IDENTIFY>(t => t.ID == entity.IDENTIFY_ID)?.IDENTIFY_EVALUATION_PLAN_ID;
var details = entity.Nav_Details;
entity.Nav_Details = null;
entity.Nav_Details = null;
var requires = entity.Nav_Requires;
entity.Nav_Requires = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
@ -89,18 +93,11 @@ namespace APT.SK.WebApi.Controllers.Api
//});
foreach (var item in details)
{
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
if (temp == null)
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
&& t.EMERGENCY == item.EMERGENCY && t.DEPARTMENT_TYPE == item.DEPARTMENT_TYPE && t.IDENTIFY_DEPARTMENT == item.IDENTIFY_DEPARTMENT && t.IDENTIFY_POST == item.IDENTIFY_POST);
if (temp == null && item.MARK != SKMarkEnum.Add)
{
item.MARK = SKMarkEnum.Add;
}
else
{
if (temp.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
|| temp.EMERGENCY != item.EMERGENCY || temp.DEPARTMENT_TYPE != item.DEPARTMENT_TYPE || temp.IDENTIFY_DEPARTMENT != item.IDENTIFY_DEPARTMENT || temp.IDENTIFY_POST != item.IDENTIFY_POST))
{
item.MARK = SKMarkEnum.Update;
}
item.MARK = SKMarkEnum.Update;
}
}
}
@ -150,6 +147,15 @@ namespace APT.SK.WebApi.Controllers.Api
item.RISK_IDENTIFY_RESULT_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (requires != null && requires.Any())
{
foreach (var item in requires)
{
item.ORG_ID = entity.ORG_ID;
item.RISK_IDENTIFY_RESULT_ID = entity.ID;
item.Nav_Require = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
@ -179,7 +185,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -204,7 +212,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -230,7 +240,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile"});
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");

23
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
View File

@ -46,7 +46,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(t => t.ID == entity.IDENTIFY_RESULT_ID)?.IDENTIFY_EVALUATION_PLAN_ID;
var details = entity.Nav_Details;
entity.Nav_Details = null;
entity.Nav_Details = null;
var requires = entity.Nav_Requires;
entity.Nav_Requires = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
@ -107,6 +109,15 @@ namespace APT.SK.WebApi.Controllers.Api
item.IDENTIFY_RESULT_SUMMARY = entity.ID;
item.Nav_ImgFile = null;
}
}
if (requires != null && requires.Any())
{
foreach (var item in requires)
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_RESULT_SUMMARY_ID = entity.ID;
item.Nav_Require = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
@ -132,7 +143,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -155,7 +168,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any())
@ -182,7 +197,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT_SUMMARY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile"});
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");

31228
APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff