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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
ccy 2025-10-16 10:03:37 +08:00
commit 51064548fc
51 changed files with 129550 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12455,7 +12455,7 @@ namespace APT.BaseData.Services.DomainServices
var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID); var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
if (currentDepart != null) if (currentDepart != null)
{ {
if (currentDepart.DEPARTMENT_TYPE == 0) if (currentDepart.DEPARTMENT_TYPE == 10)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
if (user == null) if (user == null)
@ -12467,7 +12467,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 1) else if (currentDepart.DEPARTMENT_TYPE == 15)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList(); var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@ -12483,7 +12483,7 @@ namespace APT.BaseData.Services.DomainServices
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds); //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
} }
else if (currentDepart.DEPARTMENT_TYPE == 2) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.PARENT_ID;
departIds.Add((Guid)parentId); departIds.Add((Guid)parentId);
@ -12509,7 +12509,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 3) else if (currentDepart.DEPARTMENT_TYPE == 5)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员")); user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
@ -12556,18 +12556,18 @@ namespace APT.BaseData.Services.DomainServices
result.START_DATE = entity.START_DATE; result.START_DATE = entity.START_DATE;
result.END_DATE = entity.END_DATE; result.END_DATE = entity.END_DATE;
result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID; result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID;
result.ISCOMPANY = currentDepart.DEPARTMENT_TYPE == 3 ? SKIsStoreEnum.Yes : SKIsStoreEnum.No; result.ISCOMPANY = currentDepart.DEPARTMENT_TYPE == 5 ? SKIsStoreEnum.Yes : SKIsStoreEnum.No;
var identityIds = identitys.Select(t => t.ID).ToList(); 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); //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(); //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 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.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }); var detailList = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID });
if (detailList.Any()) if (detailList.Any())
{ {
foreach (var item in detailList) foreach (var item in detailList)
{ {
var mark = librarys.FirstOrDefault(m => 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); 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.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 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 identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
//本组是否存在有效数据 //本组是否存在有效数据
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes); var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
@ -12583,11 +12583,9 @@ namespace APT.BaseData.Services.DomainServices
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID; ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME; ideDetail.RISK_NAME = item.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION; ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.Key.TYPE_ID; ideDetail.TYPE_ID = item.Key.TYPE_ID;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE; ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE;
@ -12605,16 +12603,20 @@ namespace APT.BaseData.Services.DomainServices
var i = 1; var i = 1;
foreach (var ite in departTemps) foreach (var ite in departTemps)
{ {
var departType = "公司级"; var departType = "班组级";
if (ite == 0) if (ite == 5)
{
departType = "公司级";
}
if (ite == 10)
{ {
departType = "部门级"; departType = "部门级";
} }
if (ite == 1) if (ite == 15)
{ {
departType = "车间级"; departType = "车间级";
} }
if (ite == 2) if (ite == 20)
{ {
departType = "班组级"; departType = "班组级";
} }
@ -12742,7 +12744,7 @@ namespace APT.BaseData.Services.DomainServices
userId = user.ID; userId = user.ID;
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 0) else if (currentDepart.DEPARTMENT_TYPE == 10)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList(); var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@ -12758,7 +12760,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 1) else if (currentDepart.DEPARTMENT_TYPE == 15)
{ {
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
@ -12791,7 +12793,7 @@ namespace APT.BaseData.Services.DomainServices
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds); //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
} }
else if (currentDepart.DEPARTMENT_TYPE == 2) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -12825,7 +12827,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 3) else if (currentDepart.DEPARTMENT_TYPE == 5)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员")); user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
@ -12887,20 +12889,20 @@ 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); //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(); //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 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.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, 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 });
if (detailList.Any()) if (detailList.Any())
{ {
foreach (var de in detailList) 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.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID); 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(); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID; ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.IDENTIFY_RESULT_SUMMARY_ID = sum.ID; ideDetail.IDENTIFY_RESULT_SUMMARY_ID = sum.ID;
ideDetail.MineType = de.Key.MineType; //ideDetail.MineType = de.Key.MineType;
ideDetail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID; ideDetail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = de.Key.AREA_ID; ideDetail.AREA_ID = de.Key.AREA_ID;
ideDetail.RISK_NAME = de.Key.RISK_NAME; ideDetail.RISK_NAME = de.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = de.Key.RISK_NAME_ID; //ideDetail.RISK_NAME_ID = de.Key.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION; ideDetail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION;
ideDetail.TYPE_ID = de.Key.TYPE_ID; ideDetail.TYPE_ID = de.Key.TYPE_ID;
ideDetail.MEASURE = temp?.MEASURE; ideDetail.MEASURE = temp?.MEASURE;
@ -12909,12 +12911,13 @@ namespace APT.BaseData.Services.DomainServices
ideDetail.DEPARTMENT_TYPE = temp?.DEPARTMENT_TYPE; ideDetail.DEPARTMENT_TYPE = temp?.DEPARTMENT_TYPE;
ideDetail.IDENTIFY_DEPARTMENT = temp?.IDENTIFY_DEPARTMENT; ideDetail.IDENTIFY_DEPARTMENT = temp?.IDENTIFY_DEPARTMENT;
ideDetail.IDENTIFY_POST = temp?.IDENTIFY_POST; ideDetail.IDENTIFY_POST = temp?.IDENTIFY_POST;
ideDetail.MARK = temp == null ? SKMarkEnum.Add : temp.MARK;
summaryDetails.Add(ideDetail); summaryDetails.Add(ideDetail);
} }
} }
var param = "部门级"; var param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE; var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype == 3 || (dminetype == 0 && sum.ISCOMPANY == SKIsStoreEnum.Yes)) if (dminetype == 5 || (dminetype == 10 && sum.ISCOMPANY == SKIsStoreEnum.Yes))
{ {
param = "公司级"; param = "公司级";
} }
@ -13024,7 +13027,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (currentDepart.DEPARTMENT_TYPE == 0) if (currentDepart.DEPARTMENT_TYPE == 10)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList(); var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@ -13032,7 +13035,7 @@ namespace APT.BaseData.Services.DomainServices
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList(); var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds); departIds.AddRange(classIds);
} }
else if (currentDepart.DEPARTMENT_TYPE == 1) else if (currentDepart.DEPARTMENT_TYPE == 15)
{ {
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
@ -13045,7 +13048,7 @@ namespace APT.BaseData.Services.DomainServices
departIds.AddRange(classIds); departIds.AddRange(classIds);
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 2) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
//var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; //var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
//departIds.Add((Guid)parentId); //departIds.Add((Guid)parentId);
@ -13063,7 +13066,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 3) else if (currentDepart.DEPARTMENT_TYPE == 5)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
} }
@ -13103,15 +13106,13 @@ namespace APT.BaseData.Services.DomainServices
{ {
if (de != null) if (de != null)
{ {
var departTemp = librarys.FirstOrDefault(t =>t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.MineType == de.MineType && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_NAME_ID == de.RISK_NAME_ID && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID); var departTemp = librarys.FirstOrDefault(t =>t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID);
T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL(); T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL();
detail.ORG_ID = entity.ORG_ID; detail.ORG_ID = entity.ORG_ID;
detail.RISK_EVALUATION_ID = result.ID; detail.RISK_EVALUATION_ID = result.ID;
detail.MineType = de.MineType;
detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID; detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID;
detail.AREA_ID = de.AREA_ID; detail.AREA_ID = de.AREA_ID;
detail.RISK_NAME = de.RISK_NAME; detail.RISK_NAME = de.RISK_NAME;
detail.RISK_NAME_ID = de.RISK_NAME_ID;
detail.RISK_DESCRIPTION = de.RISK_DESCRIPTION; detail.RISK_DESCRIPTION = de.RISK_DESCRIPTION;
detail.TYPE_ID = de.TYPE_ID; detail.TYPE_ID = de.TYPE_ID;
detail.EVALUATE_L = departTemp == null ? 0 : departTemp.EVALUATE_L; detail.EVALUATE_L = departTemp == null ? 0 : departTemp.EVALUATE_L;
@ -13123,6 +13124,7 @@ namespace APT.BaseData.Services.DomainServices
detail.EVALUATE_SCORE = departTemp == null ? 0 : departTemp.EVALUATE_SCORE; detail.EVALUATE_SCORE = departTemp == null ? 0 : departTemp.EVALUATE_SCORE;
detail.EVALUATE_LEVEL = departTemp == null ? SKEvaluateLevelEnum.低风险 : departTemp.EVALUATE_LEVEL; detail.EVALUATE_LEVEL = departTemp == null ? SKEvaluateLevelEnum.低风险 : departTemp.EVALUATE_LEVEL;
detail.EMERGENCY = departTemp == null ? "" : departTemp.EMERGENCY; detail.EMERGENCY = departTemp == null ? "" : departTemp.EMERGENCY;
detail.MARK = departTemp == null ? SKMarkEnum.Add : SKMarkEnum.Auto;
if (departTemp != null) if (departTemp != null)
{ {
var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList();
@ -13281,7 +13283,7 @@ namespace APT.BaseData.Services.DomainServices
var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID); var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
if (currentDepart != null) if (currentDepart != null)
{ {
if (currentDepart.DEPARTMENT_TYPE == 0) if (currentDepart.DEPARTMENT_TYPE == 10)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList(); var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@ -13289,7 +13291,7 @@ namespace APT.BaseData.Services.DomainServices
var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList(); var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
departIds.AddRange(classIds); departIds.AddRange(classIds);
} }
else if (currentDepart.DEPARTMENT_TYPE == 1) else if (currentDepart.DEPARTMENT_TYPE == 15)
{ {
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
@ -13304,7 +13306,7 @@ namespace APT.BaseData.Services.DomainServices
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds); //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
} }
else if (currentDepart.DEPARTMENT_TYPE == 2) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -13320,7 +13322,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 3) else if (currentDepart.DEPARTMENT_TYPE == 5)
{ {
departIds.Add(currentDepart.ID); departIds.Add(currentDepart.ID);
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员")); user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
@ -13329,7 +13331,7 @@ namespace APT.BaseData.Services.DomainServices
userId = user.ID; userId = user.ID;
} }
} }
var departId = departs.FirstOrDefault(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 0); var departId = departs.FirstOrDefault(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 10);
if (departId != null) if (departId != null)
{ {
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员")); user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
@ -13376,20 +13378,18 @@ namespace APT.BaseData.Services.DomainServices
result.ISCOMPANY = entity.ISCOMPANY; result.ISCOMPANY = entity.ISCOMPANY;
var resultIds = results.Select(t => t.ID).ToList(); 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 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.MineType, m.RISK_NAME, m.RISK_NAME_ID, 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 });
if (detailList.Any()) if (detailList.Any())
{ {
foreach (var de in detailList) 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.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID); 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(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL detail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
detail.ORG_ID = entity.ORG_ID; detail.ORG_ID = entity.ORG_ID;
detail.RISK_EVALUATION_SUMMARY_ID = result.ID; detail.RISK_EVALUATION_SUMMARY_ID = result.ID;
detail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID; detail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
detail.MineType = de == null ? SKProductionUnit.Mine : de.Key.MineType;
detail.AREA_ID = de.Key.AREA_ID; detail.AREA_ID = de.Key.AREA_ID;
detail.RISK_NAME = de.Key.RISK_NAME; detail.RISK_NAME = de.Key.RISK_NAME;
detail.RISK_NAME_ID = de.Key.RISK_NAME_ID;
detail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION; detail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION;
detail.TYPE_ID = de.Key.TYPE_ID; detail.TYPE_ID = de.Key.TYPE_ID;
detail.EVALUATE_L = temp.EVALUATE_L; detail.EVALUATE_L = temp.EVALUATE_L;
@ -13401,6 +13401,7 @@ namespace APT.BaseData.Services.DomainServices
detail.EVALUATE_SCORE = temp.EVALUATE_SCORE; detail.EVALUATE_SCORE = temp.EVALUATE_SCORE;
detail.EMERGENCY = temp.EMERGENCY; detail.EMERGENCY = temp.EMERGENCY;
detail.EVALUATE_LEVEL = temp.EVALUATE_LEVEL; detail.EVALUATE_LEVEL = temp.EVALUATE_LEVEL;
detail.MARK = temp == null ? SKMarkEnum.Add : temp.MARK;
resultDetails.Add(detail); resultDetails.Add(detail);
if (temp.Nav_DetailMeasures != null && temp.Nav_DetailMeasures.Any()) if (temp.Nav_DetailMeasures != null && temp.Nav_DetailMeasures.Any())
{ {
@ -13447,8 +13448,8 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
var param = "部门级"; var param = "部门级";
var dminetype = details.FirstOrDefault().MineType; var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype == SKProductionUnit.All) if (dminetype == 5 || (dminetype == 10 && result.ISCOMPANY == SKIsStoreEnum.Yes))
{ {
param = "公司级"; param = "公司级";
} }
@ -13470,8 +13471,8 @@ namespace APT.BaseData.Services.DomainServices
result.STATUS = PFStandardStatus.Archived; result.STATUS = PFStandardStatus.Archived;
if (user != null && resultDetails != null && resultDetails.Any()) if (user != null && resultDetails != null && resultDetails.Any())
{ {
var mineType = departs.FirstOrDefault(t => t.ID == result.APPLY_DEPARTMENT_ID)?.MineType; var productionId = resultDetails.FirstOrDefault(t=>t.PRODUCTION_UNIT_ID!=null).PRODUCTION_UNIT_ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.MineType == (SKProductionUnit)mineType, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
@ -13493,12 +13494,12 @@ namespace APT.BaseData.Services.DomainServices
detail.ORG_ID = item.ORG_ID; detail.ORG_ID = item.ORG_ID;
detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID; detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID;
detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
detail.MineType = item.MineType; //detail.MineType = item.MineType;
detail.AREA_ID = item.AREA_ID; detail.AREA_ID = item.AREA_ID;
detail.TYPE_ID = item.TYPE_ID; detail.TYPE_ID = item.TYPE_ID;
detail.RISK_DESCRIPTION = item.RISK_DESCRIPTION; detail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
detail.RISK_NAME = item.RISK_NAME; detail.RISK_NAME = item.RISK_NAME;
detail.RISK_NAME_ID = item.RISK_NAME_ID; //detail.RISK_NAME_ID = item.RISK_NAME_ID;
detail.EVALUATE_L = item.EVALUATE_L; detail.EVALUATE_L = item.EVALUATE_L;
detail.EVALUATE_E = item.EVALUATE_E; detail.EVALUATE_E = item.EVALUATE_E;
detail.EVALUATE_C = item.EVALUATE_C; detail.EVALUATE_C = item.EVALUATE_C;
@ -13508,8 +13509,9 @@ namespace APT.BaseData.Services.DomainServices
detail.EVALUATE_SCORE = item.EVALUATE_SCORE; detail.EVALUATE_SCORE = item.EVALUATE_SCORE;
detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL; detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
detail.EMERGENCY = item.EMERGENCY; detail.EMERGENCY = item.EMERGENCY;
detail.MARK = item.MARK;
douDetails.Add(detail); douDetails.Add(detail);
var libraryFirst = librarys.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_NAME_ID == item.RISK_NAME_ID && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID); var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
if (libraryFirst != null) if (libraryFirst != null)
{ {
var ldeparts = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList(); var ldeparts = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
@ -13644,7 +13646,7 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(contentHiddenss); BantchSaveEntityNoCommit(contentHiddenss);
if (contentDepartPosts != null && contentDepartPosts.Count > 0) if (contentDepartPosts != null && contentDepartPosts.Count > 0)
BantchSaveEntityNoCommit(contentDepartPosts); BantchSaveEntityNoCommit(contentDepartPosts);
}, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估汇总表审批(" + dminetype.GetDescription() + ")"); }, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估汇总表审批(" + param + ")");
return true; return true;
//notice = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估汇总表(" + param + ")", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK041"); //notice = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估汇总表(" + param + ")", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK041");
@ -13738,8 +13740,8 @@ namespace APT.BaseData.Services.DomainServices
if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any()) if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any())
{ {
var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID);
var mineType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.MineType; var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID!=null)?.PRODUCTION_UNIT_ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.MineType == (SKProductionUnit)mineType, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
@ -13761,20 +13763,24 @@ namespace APT.BaseData.Services.DomainServices
detail.ORG_ID = item.ORG_ID; detail.ORG_ID = item.ORG_ID;
detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID; detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID;
detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
detail.MineType = item.MineType; //detail.MineType = item.MineType;
detail.AREA_ID = item.AREA_ID; detail.AREA_ID = item.AREA_ID;
detail.TYPE_ID = item.TYPE_ID; detail.TYPE_ID = item.TYPE_ID;
detail.RISK_DESCRIPTION = item.RISK_DESCRIPTION; detail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
detail.RISK_NAME = item.RISK_NAME; detail.RISK_NAME = item.RISK_NAME;
detail.RISK_NAME_ID = item.RISK_NAME_ID; //detail.RISK_NAME_ID = item.RISK_NAME_ID;
detail.EVALUATE_L = item.EVALUATE_L; detail.EVALUATE_L = item.EVALUATE_L;
detail.EVALUATE_E = item.EVALUATE_E; detail.EVALUATE_E = item.EVALUATE_E;
detail.EVALUATE_C = item.EVALUATE_C; detail.EVALUATE_C = item.EVALUATE_C;
detail.SCOREC_ID = item?.SCOREC_ID;
detail.SCOREE_ID = item?.SCOREE_ID;
detail.SCOREL_ID = item?.SCOREL_ID;
detail.EVALUATE_SCORE = item.EVALUATE_SCORE; detail.EVALUATE_SCORE = item.EVALUATE_SCORE;
detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL; detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
detail.EMERGENCY = item.EMERGENCY; detail.EMERGENCY = item.EMERGENCY;
detail.MARK = item.MARK;
details.Add(detail); details.Add(detail);
var libraryFirst = librarys.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_NAME_ID == item.RISK_NAME_ID && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID); var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
if (libraryFirst != null) if (libraryFirst != null)
{ {
var departs = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList(); var departs = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();

129141
APT.Data.Migrations/Migrations/20251009075846_hmr2025100901.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

46
APT.Data.Migrations/Migrations/20251009075846_hmr2025100901.cs Normal file
View File

@ -0,0 +1,46 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025100901 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "MARK",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "MARK",
table: "T_SK_RISK_EVALUATION_DETAIL",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "MARK",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "int",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "MARK",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "MARK",
table: "T_SK_RISK_EVALUATION_DETAIL");
migrationBuilder.DropColumn(
name: "MARK",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
}
}
}

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

@ -73571,6 +73571,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED") b.Property<bool>("IS_DELETED")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<int>("MARK")
.HasColumnType("int");
b.Property<Guid?>("MODIFIER_ID") b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -79002,6 +79005,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED") b.Property<bool>("IS_DELETED")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<int>("MARK")
.HasColumnType("int");
b.Property<string>("MEASURE") b.Property<string>("MEASURE")
.HasMaxLength(500) .HasMaxLength(500)
.HasColumnType("nvarchar(500)"); .HasColumnType("nvarchar(500)");
@ -79471,6 +79477,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED") b.Property<bool>("IS_DELETED")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<int>("MARK")
.HasColumnType("int");
b.Property<string>("MEASURE") b.Property<string>("MEASURE")
.HasMaxLength(500) .HasMaxLength(500)
.HasColumnType("nvarchar(500)"); .HasColumnType("nvarchar(500)");

6
APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs
View File

@ -145,5 +145,11 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：分值C")] [Description("导航属性：分值C")]
public T_SK_SCOREC Nav_SCOREC { get; set; } public T_SK_SCOREC Nav_SCOREC { get; set; }
/// <summary>
/// 标识
/// </summary>
[Description("标识")]
public SKMarkEnum MARK { get; set; }
} }
} }

6
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs
View File

@ -150,5 +150,11 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：分值C")] [Description("导航属性：分值C")]
public T_SK_SCOREC Nav_SCOREC { get; set; } public T_SK_SCOREC Nav_SCOREC { get; set; }
/// <summary>
/// 标识
/// </summary>
[Description("标识")]
public SKMarkEnum MARK { get; set; }
} }
} }

6
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs
View File

@ -151,5 +151,11 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：分值C")] [Description("导航属性：分值C")]
public T_SK_SCOREC Nav_SCOREC { get; set; } public T_SK_SCOREC Nav_SCOREC { get; set; }
/// <summary>
/// 标识
/// </summary>
[Description("标识")]
public SKMarkEnum MARK { get; set; }
} }
} }

4
APT.MicroApi/APT.BD.WebApi/appsettings.Pdev.json
View File

@ -23,8 +23,8 @@
"TenantConnKey": "PDEVJY" "TenantConnKey": "PDEVJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

8
APT.MicroApi/APT.BD.WebApi/appsettings.Production.json
View File

@ -14,15 +14,15 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyBD", "Scope": "oEnergyBD",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHKSAQJY" "TenantConnKey": "MHKSAQJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

6
APT.MicroApi/APT.BS.WebApi/appsettings.Pdev.json
View File

@ -21,12 +21,12 @@
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"Env": "1", //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1", //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
"TenantConnKey": "PDEVJY", "TenantConnKey": "PDEVJY",
"Img_Local": "D:\\release\\img\\", "Img_Local": "D:\\XW\\UploadFile\\",
"File_DownLoad": "downLoad\\" "File_DownLoad": "downLoad\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

13
APT.MicroApi/APT.BS.WebApi/appsettings.Production.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;", //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;",
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;",
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -15,17 +16,17 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyHM", "Scope": "oEnergyHM",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHJY", "TenantConnKey": "MHJY",
"Img_Local": "D:\\release\\img\\", "Img_Local": "D:\\XW\\UploadFile\\",
"File_DownLoad": "downLoad\\" "File_DownLoad": "downLoad\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

8
APT.MicroApi/APT.FM.WebApi/appsettings.Pdev.json
View File

@ -7,7 +7,7 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" "default": "Server=124.117.209.78;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -23,11 +23,11 @@
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "PDEVJY", "TenantConnKey": "PDEVJY",
"Env": "1", //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1", //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
"Img_Local": "D:\\release\\img" "Img_Local": "D:\\XW\\UploadFile\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

13
APT.MicroApi/APT.FM.WebApi/appsettings.Production.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;",
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -15,17 +16,17 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyFM", "Scope": "oEnergyFM",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"RedisFormConfig": "true", "RedisFormConfig": "true",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHJY", "TenantConnKey": "MHJY",
"Img_Local": "D:\\release\\img" "Img_Local": "D:\\XW\\UploadFile\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

6
APT.MicroApi/APT.FO.WebApi/appsettings.Pdev.json
View File

@ -21,11 +21,11 @@
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "PDEVJY", "TenantConnKey": "PDEVJY",
"Env": "1", //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1", //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
"Img_Local": "D:\\release\\img" "Img_Local": "D:\\XW\\UploadFile\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

10
APT.MicroApi/APT.FO.WebApi/appsettings.Production.json
View File

@ -14,16 +14,16 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyFO", "Scope": "oEnergyFO",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHJY", "TenantConnKey": "MHJY",
"Img_Local": "D:\\release\\img" "Img_Local": "D:\\XW\\UploadFile\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

4
APT.MicroApi/APT.HM.WebApi/appsettings.Pdev.json
View File

@ -23,8 +23,8 @@
"Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

8
APT.MicroApi/APT.HM.WebApi/appsettings.Production.json
View File

@ -14,15 +14,15 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyHM", "Scope": "oEnergyHM",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHKSAQJY" "TenantConnKey": "MHKSAQJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

4
APT.MicroApi/APT.LG.WebApi/appsettings.Pdev.json
View File

@ -23,8 +23,8 @@
"Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

8
APT.MicroApi/APT.LG.WebApi/appsettings.Production.json
View File

@ -14,15 +14,15 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyLG", "Scope": "oEnergyLG",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHKSAQJY" "TenantConnKey": "MHKSAQJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

4
APT.MicroApi/APT.NW.WebApi/appsettings.Pdev.json
View File

@ -23,8 +23,8 @@
"Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

8
APT.MicroApi/APT.NW.WebApi/appsettings.Production.json
View File

@ -14,15 +14,15 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyNW", "Scope": "oEnergyNW",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHKSAQJY" "TenantConnKey": "MHKSAQJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

7
APT.MicroApi/APT.OP.WebApi/appsettings.Pdev.json
View File

@ -1,6 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=124.117.209.78;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -17,8 +18,8 @@
"Env": "1" //1：外机IP；默认0 内机IP "Env": "1" //1：外机IP；默认0 内机IP
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://120.25.146.51:8086", "Url": "http://120.25.146.51:8086",

11
APT.MicroApi/APT.OP.WebApi/appsettings.Production.json
View File

@ -1,6 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -8,15 +9,15 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyOP", "Scope": "oEnergyOP",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHJY" "TenantConnKey": "MHJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

9
APT.MicroApi/APT.PF.WebApi/appsettings.Pdev.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //<EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> //"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;", //<EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
"default": "Server=124.117.209.78;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -23,11 +24,11 @@
"TenantConnKey": "PDEVJY", "TenantConnKey": "PDEVJY",
"RedisFormConfig": "true", "RedisFormConfig": "true",
"Env": "1", //外网IP 0：内网IP "Env": "1", //外网IP 0：内网IP
"Img_Local": "D:\\release\\img" "Img_Local": "D:\\XW\\UploadFile\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

13
APT.MicroApi/APT.PF.WebApi/appsettings.Production.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //<EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> //"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //<EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -15,17 +16,17 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyPF", "Scope": "oEnergyPF",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHJY", "TenantConnKey": "MHJY",
"RedisFormConfig": "true", "RedisFormConfig": "true",
"Img_Local": "D:\\release\\img" "Img_Local": "D:\\XW\\UploadFile\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

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

@ -588,7 +588,7 @@ namespace APT.PP.WebApi.Controllers.Api
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var baseFilter = new BaseFilter(filter.GetOrgId()); var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true; baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "ID", "MineType", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON", baseFilter.SelectField = new string[] { "ID", "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON",
"Nav_CheckNoticeDetails.RISK_AREA_ID","Nav_CheckNoticeDetails.CHECK_CONTENTS_ID","Nav_CheckNoticeDetails.CHECKCONTENT","Nav_CheckNoticeDetails.CHECKPROOF","Nav_CheckNoticeDetails.CHECKSTANDARD", "Nav_CheckNoticeDetails.RISK_AREA_ID","Nav_CheckNoticeDetails.CHECK_CONTENTS_ID","Nav_CheckNoticeDetails.CHECKCONTENT","Nav_CheckNoticeDetails.CHECKPROOF","Nav_CheckNoticeDetails.CHECKSTANDARD",
"Nav_CheckNoticeFiles.IMG_FILE_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.USER_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.LAW_ID" }; //指定字段，包括导航属性 "Nav_CheckNoticeFiles.IMG_FILE_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.USER_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.LAW_ID" }; //指定字段，包括导航属性
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CHECK_TIME != null && i.CHECK_TIME.Value.Date == DateTime.Now.Date && i.CHECK_TIME.Value.Hour == dtNow.Hour; Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CHECK_TIME != null && i.CHECK_TIME.Value.Date == DateTime.Now.Date && i.CHECK_TIME.Value.Hour == dtNow.Hour;
@ -624,7 +624,7 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_SECURITY_INSPECTION_RECORD record = new T_SK_SECURITY_INSPECTION_RECORD(); T_SK_SECURITY_INSPECTION_RECORD record = new T_SK_SECURITY_INSPECTION_RECORD();
record.SECURITY_INSPECTION_NOTICE_ID = item.ID; record.SECURITY_INSPECTION_NOTICE_ID = item.ID;
record.ORG_ID = filter.GetOrgId(); record.ORG_ID = filter.GetOrgId();
record.MineType = item.MineType; //record.MineType = item.MineType;
record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.APPLY_DEPARTMENT_ID = item.APPLY_DEPARTMENT_ID; record.APPLY_DEPARTMENT_ID = item.APPLY_DEPARTMENT_ID;
record.APPLY_USER_ID = item.APPLY_USER_ID; record.APPLY_USER_ID = item.APPLY_USER_ID;
@ -4927,6 +4927,7 @@ namespace APT.PP.WebApi.Controllers.Api
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> detailContents = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(); List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> detailContents = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
if (setList != null && setList.Any()) 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 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 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 departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User");
@ -4963,7 +4964,7 @@ namespace APT.PP.WebApi.Controllers.Api
{ {
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = post?.NAME; 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.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID; de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -4983,7 +4984,7 @@ namespace APT.PP.WebApi.Controllers.Api
{ {
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = "未配置辨识岗位"; de.POST_NAME = "未配置辨识岗位";
de.MineType = item.MineType; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_NAME = item.Nav_Area?.NAME; de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID; de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -5041,14 +5042,14 @@ namespace APT.PP.WebApi.Controllers.Api
} }
} }
} }
var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList(); var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.PRODUCTION_UNIT_ID, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList();
foreach (var item in group) foreach (var item in group)
{ {
CheckListNew listNew = new CheckListNew(); CheckListNew listNew = new CheckListNew();
listNew.Mine = item.Key.MineType; listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
listNew.Cycle = item.Key.CHECK_CYCLE; listNew.Cycle = item.Key.CHECK_CYCLE;
listNew.DepartType = item.Key.CHECK_TYPE; listNew.DepartType = item.Key.CHECK_TYPE;
listNew.MineType = item.Key.MineType.GetDescription(); listNew.MineType = proMinetypes.FirstOrDefault(t=>t.ID == item.Key.PRODUCTION_UNIT_ID)?.NAME;
listNew.CheckType = item.Key.TYPE_NAME; listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription(); listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription(); listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
@ -5058,7 +5059,7 @@ namespace APT.PP.WebApi.Controllers.Api
listNew.CheckPost = item.Key.POST_NAME; listNew.CheckPost = item.Key.POST_NAME;
listNew.CheckDepartId = item.Key.DEPARTMENT_ID; listNew.CheckDepartId = item.Key.DEPARTMENT_ID;
listNew.CheckTypeId = item.Key.CHECK_TYPE_ID; listNew.CheckTypeId = item.Key.CHECK_TYPE_ID;
var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.MineType == item.Key.MineType && t.POST_NAME == item.Key.POST_NAME && t.POST_ID == item.Key.POST_ID).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList(); var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && t.POST_NAME == item.Key.POST_NAME && t.POST_ID == item.Key.POST_ID).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList();
var temps = contents.Where(t => depathaveIds.Contains(t.ID)).Distinct().ToList(); var temps = contents.Where(t => depathaveIds.Contains(t.ID)).Distinct().ToList();
if (temps.Any()) if (temps.Any())
{ {
@ -5075,11 +5076,11 @@ namespace APT.PP.WebApi.Controllers.Api
checkListDetail.CHECKSTANDARD = tem.CHECK_STANDARD; checkListDetail.CHECKSTANDARD = tem.CHECK_STANDARD;
listDetail.Add(checkListDetail); listDetail.Add(checkListDetail);
} }
listNew.details = listDetail.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); list.Add(listNew);
} }
list = list.Where(m => m.CheckDepartId != null).OrderBy(y => y.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); list = list.Where(m => m.CheckDepartId != null).OrderBy(y => y.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
} }
DateTime dt = DateTime.Now; DateTime dt = DateTime.Now;
if (filter.Parameter1 != null) if (filter.Parameter1 != null)
@ -5130,7 +5131,7 @@ namespace APT.PP.WebApi.Controllers.Api
record.ORG_ID = filter.OrgId; record.ORG_ID = filter.OrgId;
record.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; record.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
record.APPLY_USER_ID = userInfo.ID; record.APPLY_USER_ID = userInfo.ID;
record.MineType = item.Mine; record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.CHECK_TYPE_ID = item.CheckTypeId; record.CHECK_TYPE_ID = item.CheckTypeId;
record.PLANCHECKFREQUENCY = item.Cycle; record.PLANCHECKFREQUENCY = item.Cycle;
record.DEPARTMENT_TYPE = item.DepartType; record.DEPARTMENT_TYPE = item.DepartType;
@ -5199,7 +5200,7 @@ namespace APT.PP.WebApi.Controllers.Api
{ {
foreach (var item in checkList) foreach (var item in checkList)
{ {
var setTime = setList.FirstOrDefault(t => t.MineType == item.Mine && t.CHECK_CYCLE == item.Cycle); 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); var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
//触发安全检查通知给对应的审批角色 //触发安全检查通知给对应的审批角色
if (item.CheckPost == "安环部安全员") if (item.CheckPost == "安环部安全员")
@ -5225,7 +5226,7 @@ namespace APT.PP.WebApi.Controllers.Api
safeNotice.ORG_ID = filter.OrgId; safeNotice.ORG_ID = filter.OrgId;
safeNotice.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; safeNotice.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
safeNotice.APPLY_USER_ID = userInfo.ID; safeNotice.APPLY_USER_ID = userInfo.ID;
safeNotice.MineType = item.Mine; safeNotice.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
safeNotice.CHECK_TYPE_ID = item.CheckTypeId; safeNotice.CHECK_TYPE_ID = item.CheckTypeId;
safeNotice.PLANCHECKFREQUENCY = item.Cycle; safeNotice.PLANCHECKFREQUENCY = item.Cycle;
safeNotice.DEPARTMENT_TYPE = item.DepartType; safeNotice.DEPARTMENT_TYPE = item.DepartType;

7
APT.MicroApi/APT.PP.WebApi/appsettings.Pdev.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;", //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;",
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=124.117.209.78;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -24,8 +25,8 @@
"Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

13
APT.MicroApi/APT.PP.WebApi/appsettings.Production.json
View File

@ -7,8 +7,9 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;", //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;",
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;", //"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;",
"tpm": "Data Source=10.2.7.17;Initial Catalog=QLTPMDB;Persist Security Info=True;User ID=MHUser;Password=MHUser2024ok%" //"tpm": "Data Source=10.2.7.17;Initial Catalog=QLTPMDB;Persist Security Info=True;User ID=MHUser;Password=MHUser2024ok%"
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -16,15 +17,15 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyPP", "Scope": "oEnergyPP",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHKSAQJY" "TenantConnKey": "MHKSAQJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

9
APT.MicroApi/APT.SC.WebApi/appsettings.Pdev.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;", //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;",
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=124.117.209.78;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -23,12 +24,12 @@
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "PDEVJY", "TenantConnKey": "PDEVJY",
"Env": "1", //1：外机IP；默认0 内机IP, "Env": "1", //1：外机IP；默认0 内机IP,
"Img_Local": "D:\\release\\img\\", "Img_Local": "D:\\XW\\UploadFile\\",
"File_DownLoad": "downLoad\\" "File_DownLoad": "downLoad\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

13
APT.MicroApi/APT.SC.WebApi/appsettings.Production.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;", //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;",
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -15,18 +16,18 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergySC", "Scope": "oEnergySC",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"RedisFormConfig": "true", "RedisFormConfig": "true",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHJY", "TenantConnKey": "MHJY",
"Img_Local": "D:\\release\\img\\", "Img_Local": "D:\\XW\\UploadFile\\",
"File_DownLoad": "downLoad\\" "File_DownLoad": "downLoad\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

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

@ -255,6 +255,8 @@ namespace APT.SK.WebApi.Controllers
pageFilter.Include.Add("Nav_SCOREE"); pageFilter.Include.Add("Nav_SCOREE");
pageFilter.Include.Add("Nav_SCOREC"); pageFilter.Include.Add("Nav_SCOREC");
pageFilter.Include.Add("Nav_Type"); pageFilter.Include.Add("Nav_Type");
pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.SelectField.Add("Nav_Details.NUM");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
var result = WitOrderPaged(null, pageFilter); var result = WitOrderPaged(null, pageFilter);
if (result != null && result.Data != null && result.Data.Any()) if (result != null && result.Data != null && result.Data.Any())
@ -270,14 +272,14 @@ namespace APT.SK.WebApi.Controllers
{ {
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME)) if (item2 != null && !string.IsNullOrEmpty(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; item.MINE_NAME = item.MINE_NAME + temp;
i++; i++;
} }
} }
} }
} }
result.Data.OrderBy(t => t.MineType).ThenBy(m => m.EVALUATE_LEVEL); result.Data.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.EVALUATE_LEVEL);
} }
return result; return result;
} }
@ -509,7 +511,7 @@ namespace APT.SK.WebApi.Controllers
if (!string.IsNullOrEmpty(id)) if (!string.IsNullOrEmpty(id))
{ {
result = this.GetEntity<T_SK_BASIC_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName", result = this.GetEntity<T_SK_BASIC_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"}); "Nav_SCOREL","Nav_SCOREE","Nav_SCOREC","Nav_ProductionUnit"});
} }
if (result != null) if (result != null)
{ {

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

@ -491,7 +491,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_DoubleFiles.Nav_ImgFile"}); "Nav_DoubleFiles.Nav_ImgFile"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(t => t.DOUBLE_PREVENT_MECHANISM_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC"); var details = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(t => t.DOUBLE_PREVENT_MECHANISM_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

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

@ -77,6 +77,7 @@ namespace APT.SK.WebApi.Controllers.Api
public class CheckListNew public class CheckListNew
{ {
public string MineType { get; set; } public string MineType { get; set; }
public Guid? PRODUCTION_UNIT_ID { get; set; }
public string CheckType { get; set; } public string CheckType { get; set; }
public string CheckCycle { get; set; } public string CheckCycle { get; set; }
@ -628,6 +629,8 @@ namespace APT.SK.WebApi.Controllers.Api
} }
pageFilter.Include.Add("Nav_RiskName"); pageFilter.Include.Add("Nav_RiskName");
pageFilter.Include.Add("Nav_Details"); pageFilter.Include.Add("Nav_Details");
pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.SelectField.Add("Nav_Details.NUM");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person"); var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person");
var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId)); var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId));
@ -640,7 +643,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var item in result.Data) foreach (var item in result.Data)
{ {
//管控措施 //管控措施
var detailStr = new List<string>(); var detailStr = new List<string>(); var detailNum = new List<int?>();
if (item.Nav_Details != null && item.Nav_Details.Any()) if (item.Nav_Details != null && item.Nav_Details.Any())
{ {
var i = 1; var i = 1;
@ -649,26 +652,27 @@ namespace APT.SK.WebApi.Controllers.Api
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME)) if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
{ {
detailStr.Add(item2.MEASURES_NAME); detailStr.Add(item2.MEASURES_NAME);
var temp = i + "、" + item2.MEASURES_NAME + Environment.NewLine; detailNum.Add(item2.NUM);
var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp; item.MINE_NAME = item.MINE_NAME + temp;
i++; i++;
} }
} }
} }
if (detailStr.Any()) //if (detailStr.Any())
{ //{
detailStr = detailStr.Distinct().ToList(); // detailStr = detailStr.Distinct().ToList();
var i = 1; // var i = 1;
foreach (var item2 in detailStr) // foreach (var item2 in detailStr)
{ // {
if (!string.IsNullOrEmpty(item2)) // if (!string.IsNullOrEmpty(item2))
{ // {
var temp = i + "、" + item2 + "\r\n"; // var temp = i + "、" + item2 + "\r\n";
item.MEASURE = item.MEASURE + temp; // item.MEASURE = item.MEASURE + temp;
i++; // i++;
} // }
} // }
} //}
//辨识层级、部门、岗位 //辨识层级、部门、岗位
var levelStr = new List<string>(); var levelStr = new List<string>();
var departIds = new List<Guid>(); var departIds = new List<Guid>();
@ -694,23 +698,23 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
if (!string.IsNullOrEmpty(item2)) if (!string.IsNullOrEmpty(item2))
{ {
var type = 0; var type = 20;
switch (item2) switch (item2)
{ {
case "部门": case "部门":
type = 0; type = 10;
break; break;
case "车间": case "车间":
type = 1; type = 15;
break; break;
case "班组": case "班组":
type = 2; type = 20;
break; break;
case "公司": case "公司":
type = 3; type = 5;
break; break;
default: default:
type = 0; type = 20;
break; break;
} }
var temp = i + "、" + item2 + Environment.NewLine; var temp = i + "、" + item2 + Environment.NewLine;
@ -731,7 +735,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
result.Data.OrderBy(t => t.EVALUATE_LEVEL); result.Data.OrderBy(t => t.EVALUATE_LEVEL);
} }
result.Data.OrderBy(t => t.MineType).ThenBy(m => m.EVALUATE_LEVEL); result.Data.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.EVALUATE_LEVEL);
} }
return result; return result;
} }
@ -2069,7 +2073,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
var result = new T_SK_ENTERPRISE_LIBRARY(); var result = new T_SK_ENTERPRISE_LIBRARY();
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID")?.Value.ToString(); var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID")?.Value.ToString();
var mineType = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "MineType"); var mineType = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PRODUCTION_UNIT_ID");
var areaId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "AREA_ID"); var areaId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "AREA_ID");
//var typeId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TYPE_ID"); //var typeId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TYPE_ID");
var riskName = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "RISK_NAME"); var riskName = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "RISK_NAME");
@ -2078,40 +2082,12 @@ namespace APT.SK.WebApi.Controllers.Api
if (!string.IsNullOrEmpty(id)) if (!string.IsNullOrEmpty(id))
{ {
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName", result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"}); "Nav_SCOREL","Nav_SCOREE","Nav_SCOREC","Nav_ProductionUnit"});
} }
else if (mineType != null && areaId != null && riskName != null)//&& typeId != null && riskDes!=null else if (mineType != null && areaId != null && riskName != null)//&& typeId != null && riskDes!=null
{ {
var temp = SKProductionUnit.All; result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t => t.PRODUCTION_UNIT_ID == Guid.Parse(mineType.Value.ToString()) && t.AREA_ID == Guid.Parse(areaId.Value.ToString()) && t.RISK_NAME == riskName.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
switch (mineType.Value.ToString()) "Nav_SCOREL","Nav_SCOREE","Nav_SCOREC","Nav_ProductionUnit"});
{
case "0":
temp = SKProductionUnit.All;
break;
case "10":
temp = SKProductionUnit.MineChoose;
break;
case "20":
temp = SKProductionUnit.Minelast;
break;
case "30":
temp = SKProductionUnit.Mine;
break;
case "40":
temp = SKProductionUnit.MineUnderGround;
break;
case "31":
temp = SKProductionUnit.Department;
break;
case "32":
temp = SKProductionUnit.Nonmetallic;
break;
default:
temp = SKProductionUnit.All;
break;
}
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == temp && t.AREA_ID == Guid.Parse(areaId.Value.ToString()) && t.RISK_NAME == riskName.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"});
} }
if (result != null) if (result != null)
{ {
@ -2307,45 +2283,48 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var userInfo = this.GetEntity<T_FM_USER>(t => t.ID == loginUser); var userInfo = this.GetEntity<T_FM_USER>(t => t.ID == loginUser, "Nav_ProdutionUnit");
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); List<Guid> selectMinetype = new List<Guid>();
List<string> selectMinetype = new List<string>(); if (userInfo != null && userInfo.Nav_ProdutionUnit != null && userInfo.Nav_ProdutionUnit.Any())
var minetype = departs.FirstOrDefault(t => t.ID == loginDepart)?.MineType;
switch (minetype)
{ {
case 0: selectMinetype = userInfo.Nav_ProdutionUnit.Select(t => t.ID).Distinct().ToList();
selectMinetype.Add(SKProductionUnit.All.GetDescription());
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
selectMinetype.Add(SKProductionUnit.Department.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
case 10:
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
case 20:
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
break;
case 30:
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
break;
case 40:
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
break;
default:
selectMinetype.Add(SKProductionUnit.All.GetDescription());
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
selectMinetype.Add(SKProductionUnit.Department.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
} }
//var minetype = departs.FirstOrDefault(t => t.ID == loginDepart)?.MineType;
//switch (minetype)
//{
// case 0:
// selectMinetype.Add(SKProductionUnit.All.GetDescription());
// selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
// selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
// selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
// selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
// selectMinetype.Add(SKProductionUnit.Department.GetDescription());
// selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
// break;
// case 10:
// selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
// selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
// selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
// break;
// case 20:
// selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
// break;
// case 30:
// selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
// break;
// case 40:
// selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
// break;
// default:
// selectMinetype.Add(SKProductionUnit.All.GetDescription());
// selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
// selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
// selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
// selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
// selectMinetype.Add(SKProductionUnit.Department.GetDescription());
// selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
// break;
//}
//List<Guid> departmentIds = new List<Guid>() { loginDepart.Value }; //List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
//DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds); //DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
var checkList = new JsonActionResult<List<CheckListNew>>(); var checkList = new JsonActionResult<List<CheckListNew>>();
@ -2353,7 +2332,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> detailContents = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(); List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> detailContents = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME == "岗位排查", new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList(); var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME == "岗位排查", new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var users = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Person").ToList(); var users = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Person").ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").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 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 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(); var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
@ -2383,7 +2362,8 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = post?.NAME; de.POST_NAME = post?.NAME;
de.MineType = item.MineType; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
de.AREA_NAME = item.Nav_Area?.NAME; de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID; de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -2402,7 +2382,8 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = "未配置辨识岗位"; de.POST_NAME = "未配置辨识岗位";
de.MineType = item.MineType; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
de.AREA_NAME = item.Nav_Area?.NAME; de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID; de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -2455,18 +2436,19 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
var group = detailContents.GroupBy(t => new { t.MineType, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME }).ToList(); var group = detailContents.GroupBy(t => new { t.PRODUCTION_UNIT_ID, t.MINE_NAME,t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME }).ToList();
foreach (var item in group) foreach (var item in group)
{ {
CheckListNew listNew = new CheckListNew(); CheckListNew listNew = new CheckListNew();
listNew.MineType = item.Key.MineType.GetDescription(); listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
listNew.MineType = item.Key.MINE_NAME;
listNew.CheckType = item.Key.TYPE_NAME; listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription(); listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription(); listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
listNew.Num = (int)item.Key.CHECK_TYPE; listNew.Num = (int)item.Key.CHECK_TYPE;
listNew.CheckDepart = item.Key.DEPART_NAME; listNew.CheckDepart = item.Key.DEPART_NAME;
listNew.CheckPost = item.Key.POST_NAME; listNew.CheckPost = item.Key.POST_NAME;
var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.MineType == item.Key.MineType && t.POST_NAME == item.Key.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList(); var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && t.POST_NAME == item.Key.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList();
var temps = contents.Where(t => depathaveIds.Contains(t.ID)).Distinct().ToList(); var temps = contents.Where(t => depathaveIds.Contains(t.ID)).Distinct().ToList();
if (temps.Any()) if (temps.Any())
{ {
@ -2489,11 +2471,11 @@ namespace APT.SK.WebApi.Controllers.Api
} }
if (userInfo != null && userInfo.NAME.Contains("管理员")) if (userInfo != null && userInfo.NAME.Contains("管理员"))
{ {
checkList.Data = list.OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); checkList.Data = list.OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
} }
else else
{ {
checkList.Data = list.Where(t => selectMinetype.Contains(t.MineType)).OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); checkList.Data = list.Where(t => t.PRODUCTION_UNIT_ID!=null && selectMinetype.Contains((Guid)t.PRODUCTION_UNIT_ID)).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
} }
checkList.TotalCount = checkList.Data.Count; checkList.TotalCount = checkList.Data.Count;
} }

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
View File

@ -109,7 +109,8 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenLevel == SKHiddenLevel.General) if (hiddenLevel == SKHiddenLevel.General)
{ {
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
level = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); //level = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
level = ((SKDepartmentTypeEnum)departmentType).GetDescription();
} }
//触发审批 //触发审批
entity.STATUS = PFStandardStatus.Approving; entity.STATUS = PFStandardStatus.Approving;

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs
View File

@ -54,7 +54,8 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenLevel == SKHiddenLevel.General) if (hiddenLevel == SKHiddenLevel.General)
{ {
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); //param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
} }
entity.STATUS = PFStandardStatus.Approving; entity.STATUS = PFStandardStatus.Approving;
//取审批流水码 //取审批流水码

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

@ -402,7 +402,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyFiles.Nav_ImgFile"}); "Nav_RectifyFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ImplementUser", "Nav_AcceptUser", "Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetailBasics.Nav_Law"); var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ImplementUser", "Nav_AcceptUser", "Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetailBasics.Nav_Law");
@ -428,7 +428,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law", "Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile",
"Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile"}); "Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())//&& taskId != null if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())//&& taskId != null
{ {
@ -455,7 +455,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law", "Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile",
"Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile"}); "Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile", "Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())// && taskId != null if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())// && taskId != null
{ {

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

@ -178,7 +178,8 @@ namespace APT.SK.WebApi.Controllers
if (entity.HIDDEN_LEVEL == SKHiddenLevel.General) if (entity.HIDDEN_LEVEL == SKHiddenLevel.General)
{ {
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); //param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
} }
MFlowPermitService.InsertApprove(serialCode[0], "SK022", param, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(serialCode[0], "SK022", param, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () =>
{ {
@ -426,7 +427,7 @@ namespace APT.SK.WebApi.Controllers
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea","Nav_Contents","Nav_Question", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea","Nav_Contents","Nav_Question","Nav_ProductionUnit",
"Nav_RecitifyUser.Nav_Department","Nav_RecitifyUser.Nav_UserSignFiles","Nav_ImplementUser.Nav_UserSignFiles","Nav_AcceptUser.Nav_UserSignFiles","Nav_AcceptUser","Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyBasics.Nav_Law"}); "Nav_RecitifyUser.Nav_Department","Nav_RecitifyUser.Nav_UserSignFiles","Nav_ImplementUser.Nav_UserSignFiles","Nav_AcceptUser.Nav_UserSignFiles","Nav_AcceptUser","Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyBasics.Nav_Law"});
if (result != null && result.STATUS == PFStandardStatus.Rejected) if (result != null && result.STATUS == PFStandardStatus.Rejected)
{ {
@ -571,6 +572,7 @@ namespace APT.SK.WebApi.Controllers
pageFilter.Include.Add("Nav_ApplyDepartment"); pageFilter.Include.Add("Nav_ApplyDepartment");
pageFilter.Include.Add("Nav_RecitifyUser"); pageFilter.Include.Add("Nav_RecitifyUser");
pageFilter.Include.Add("Nav_CheckType"); pageFilter.Include.Add("Nav_CheckType");
pageFilter.Include.Add("Nav_ProductionUnit");
result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(null, pageFilter);
return result; return result;
} }

7
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs
View File

@ -189,7 +189,8 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenLevel == SKHiddenLevel.General) if (hiddenLevel == SKHiddenLevel.General)
{ {
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
param = Enum.GetName(typeof(FMDepartmentType), departmentType); //param = Enum.GetName(typeof(FMDepartmentType), departmentType);
param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
} }
MFlowPermitService.InsertApprove(serialCode[0], "SK014", param, entity.ID, "SK014_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(serialCode[0], "SK014", param, entity.ID, "SK014_SHOWPRINT", entity.TaskID, true, () =>
{ {
@ -266,7 +267,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents","Nav_ReportDetails.Nav_Question","Nav_ReportDetails.Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents","Nav_ReportDetails.Nav_Question","Nav_ReportDetails.Nav_ReportDetailBasics.Nav_Law",
"Nav_ReportDetails.Nav_RecitifyUser.Nav_UserSignFiles", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile", "Nav_ReportDetails.Nav_RecitifyUser.Nav_UserSignFiles", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile",
"Nav_ReportFiles","Nav_ReportFiles.Nav_ImgFile"}); "Nav_ReportFiles","Nav_ReportFiles.Nav_ImgFile", "Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null
{ {
@ -451,7 +452,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_ReportFiles.Nav_ImgFile"}); "Nav_ReportFiles.Nav_ImgFile", "Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetailFiles.Nav_ImgFile"); var details = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetailFiles.Nav_ImgFile");

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

@ -68,6 +68,22 @@ namespace APT.SK.WebApi.Controllers.Api
deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
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(); 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)
{
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;
}
}
}
//record.Nav_Details.ForEach(t => //record.Nav_Details.ForEach(t =>
//{ //{
// if (t.Nav_DetailMeasures != null && t.Nav_DetailMeasures.Any()) // if (t.Nav_DetailMeasures != null && t.Nav_DetailMeasures.Any())
@ -241,7 +257,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) 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"); 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");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

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

@ -163,7 +163,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) 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"); 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");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

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

@ -74,14 +74,14 @@ namespace APT.SK.WebApi.Controllers.Api
//}); //});
foreach (var item in details) foreach (var item in details)
{ {
var temp = record.Nav_Details.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION); 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) if (temp == null)
{ {
item.MARK = SKMarkEnum.Add; item.MARK = SKMarkEnum.Add;
} }
else else
{ {
if (temp.MineType == item.MineType && 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 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.EMERGENCY != item.EMERGENCY))
{ {
item.MARK = SKMarkEnum.Update; item.MARK = SKMarkEnum.Update;
@ -212,7 +212,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) 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"); 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");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

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

@ -89,14 +89,14 @@ namespace APT.SK.WebApi.Controllers.Api
//}); //});
foreach (var item in details) foreach (var item in details)
{ {
var temp = record.Nav_Details.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION); 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) if (temp == null)
{ {
item.MARK = SKMarkEnum.Add; item.MARK = SKMarkEnum.Add;
} }
else else
{ {
if (temp.MineType == item.MineType && 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 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)) || 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;
@ -233,7 +233,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) 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"); 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");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

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

@ -185,7 +185,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) 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"); 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");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

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

@ -304,7 +304,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckNoticeDetails","Nav_CheckNoticeDetails.Nav_RiskArea","Nav_CheckNoticeDetails.Nav_Contents","Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.Nav_Law", "Nav_CheckNoticeDetails","Nav_CheckNoticeDetails.Nav_RiskArea","Nav_CheckNoticeDetails.Nav_Contents","Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.Nav_Law",
"Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.Nav_User","Nav_CheckNoticeFiles","Nav_CheckNoticeFiles.Nav_ImgFile"}); "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.Nav_User","Nav_CheckNoticeFiles","Nav_CheckNoticeFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckNoticeDetails != null && result.Nav_CheckNoticeDetails.Any())// && taskId!=null if (result != null && result.Nav_CheckNoticeDetails != null && result.Nav_CheckNoticeDetails.Any())// && taskId!=null
{ {
@ -461,7 +461,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckNoticeFiles.Nav_ImgFile"}); "Nav_CheckNoticeFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>(t => t.SECURITY_INSPECTION_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_CheckNoticeDetailBasics.Nav_Law"); var details = this.GetEntities<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>(t => t.SECURITY_INSPECTION_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_CheckNoticeDetailBasics.Nav_Law");

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

@ -653,7 +653,7 @@ namespace APT.SK.WebApi.Controllers.Api
summary.SECURITY_INSPECTION_NOTICE_ID = notice != null ? notice.ID : null; summary.SECURITY_INSPECTION_NOTICE_ID = notice != null ? notice.ID : null;
summary.APPLY_DEPARTMENT_ID = notice != null ? notice.APPLY_DEPARTMENT_ID : entity.APPLY_DEPARTMENT_ID; summary.APPLY_DEPARTMENT_ID = notice != null ? notice.APPLY_DEPARTMENT_ID : entity.APPLY_DEPARTMENT_ID;
summary.APPLY_USER_ID = notice != null ? notice.APPLY_USER_ID : entity.APPLY_USER_ID; summary.APPLY_USER_ID = notice != null ? notice.APPLY_USER_ID : entity.APPLY_USER_ID;
summary.MineType = notice != null ? notice.MineType : entity.MineType; //summary.MineType = notice != null ? notice.MineType : entity.MineType;
summary.PRODUCTION_UNIT_ID = notice != null ? notice.PRODUCTION_UNIT_ID : entity.PRODUCTION_UNIT_ID; summary.PRODUCTION_UNIT_ID = notice != null ? notice.PRODUCTION_UNIT_ID : entity.PRODUCTION_UNIT_ID;
summary.CHECK_TYPE_ID = notice != null ? notice.CHECK_TYPE_ID : entity.CHECK_TYPE_ID; summary.CHECK_TYPE_ID = notice != null ? notice.CHECK_TYPE_ID : entity.CHECK_TYPE_ID;
summary.PLANCHECKFREQUENCY = notice != null ? notice.PLANCHECKFREQUENCY : entity.PLANCHECKFREQUENCY; summary.PLANCHECKFREQUENCY = notice != null ? notice.PLANCHECKFREQUENCY : entity.PLANCHECKFREQUENCY;
@ -1127,7 +1127,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any()) if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())
{ {
@ -1241,7 +1241,7 @@ namespace APT.SK.WebApi.Controllers.Api
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile"); var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile");

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

@ -598,7 +598,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null
{ {
@ -715,7 +715,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile"); var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile");

9
APT.MicroApi/APT.SK.WebApi/appsettings.Pdev.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;", //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;",
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=124.117.209.78;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -22,12 +23,12 @@
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "PDEVJY", "TenantConnKey": "PDEVJY",
"Env": "1", //1：外机IP；默认0 内机IP, "Env": "1", //1：外机IP；默认0 内机IP,
"Img_Local": "D:\\release\\img\\", "Img_Local": "D:\\XW\\UploadFile\\",
"File_DownLoad": "downLoad\\" "File_DownLoad": "downLoad\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
}, },
"InflexdbConfig": { "InflexdbConfig": {
"Url": "http://36.133.75.96:8086/", "Url": "http://36.133.75.96:8086/",

13
APT.MicroApi/APT.SK.WebApi/appsettings.Production.json
View File

@ -7,7 +7,8 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;", //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=op;CommandTimeout=1024;",
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",
@ -15,17 +16,17 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergySC", "Scope": "oEnergySC",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHJY", "TenantConnKey": "MHJY",
"Img_Local": "D:\\release\\img\\", "Img_Local": "D:\\XW\\UploadFile\\",
"File_DownLoad": "downLoad\\" "File_DownLoad": "downLoad\\"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {

4
APT.MicroApi/APT.UT.WebApi/appsettings.Pdev.json
View File

@ -16,7 +16,7 @@
"Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP "Env": "1" //1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IP<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>0 <EFBFBD>ڻ<EFBFBD>IP
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": false
} }
} }

8
APT.MicroApi/APT.UT.WebApi/appsettings.Production.json
View File

@ -7,15 +7,15 @@
"SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=",
"Scope": "oEnergyUT", "Scope": "oEnergyUT",
"isSqlLog": "false", "isSqlLog": "false",
"IdentityServer": "http://172.26.13.0:3153/", "IdentityServer": "http://localhost:3153/",
"WebSocketPort": "3140", "WebSocketPort": "3140",
"ConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetDbConn", "ConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetDbConn",
"AllConnApiUrl": "http://172.26.13.0:5116/api/OP/TenantInfo/GetAllDbConn", "AllConnApiUrl": "http://localhost:5116/api/OP/TenantInfo/GetAllDbConn",
"ConnDataKey": "MHKSAQ1212010101", "ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHKSAQJY" "TenantConnKey": "MHKSAQJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "localhost:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
} }
} }

2
APT.MicroApi/APT.UT.WebApi/appsettings.json
View File

@ -20,7 +20,7 @@
"TenantConnKey": "MHKSAQJY" "TenantConnKey": "MHKSAQJY"
}, },
"RedisConfig": { "RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=5", "RedisConnectionString": "124.117.209.78:6379,defaultDatabase=5",
"IsRedis": true "IsRedis": true
}, },
"InflexdbConfig": { "InflexdbConfig": {