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

优化

Browse Source
This commit is contained in:
何美荣 2025-10-22 17:55:59 +08:00
parent 7f4a31f4fe
commit 952c82bf13
5 changed files with 582 additions and 566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -1509,7 +1509,7 @@ namespace APT.PP.WebApi.Controllers.Api
//公司默认职能部门 //公司默认职能部门
var company = departs.FirstOrDefault(t => t.PARENT_ID == null); var company = departs.FirstOrDefault(t => t.PARENT_ID == null);
departListIds.Add(company.ID); departListIds.Add(company.ID);
var tempids = departs.Where(t => t.DEPARTMENT_STATUS == 0).Select(m => m.ID).ToList(); var tempids = departs.Where(t => t.DEPARTMENT_STATUS != 1).Select(m => m.ID).ToList();
departListIds.AddRange(tempids); departListIds.AddRange(tempids);
//职能口统一汇总给安环部安全员 //职能口统一汇总给安环部安全员
if (departListIds.Any()) if (departListIds.Any())
@ -1541,34 +1541,31 @@ namespace APT.PP.WebApi.Controllers.Api
result.END_DATE = DateTime.Now; result.END_DATE = DateTime.Now;
result.REQUIRE_ID = requre?.ID; result.REQUIRE_ID = requre?.ID;
results.Add(result); results.Add(result);
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList(); var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重 //汇总去重
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
if (detailListYes.Any()) if (detailListYes.Any())
{ {
foreach (var item in detailListYes) foreach (var item in detailListYes)
{ {
var temp = list.Where(m =>m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//只取有效的部门岗位 //var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes); var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList(); var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList(); var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList(); T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); ideDetail.ORG_ID = filter.OrgId;
ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; ideDetail.MineType = item.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
ideDetail.MineType = item.Key.MineType; ideDetail.AREA_ID = item.AREA_ID;
ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.RISK_NAME = item.RISK_NAME;
ideDetail.RISK_NAME = item.Key.RISK_NAME; ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID; ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION; ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.TYPE_ID = item.Key.TYPE_ID; ideDetail.MEASURE = item.MEASURE;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE; ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.EMERGENCY = tempYes != null ? tempYes.EMERGENCY : temp[0]?.EMERGENCY; ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.ENABLE_STATUS = tempYes != null ? tempYes.ENABLE_STATUS : temp[0].ENABLE_STATUS;
if (departIdss.Any()) if (departIdss.Any())
{ {
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).Select(m => m.DEPARTMENT_TYPE).Distinct().ToList(); var departTemps = departs.Where(t => departIdss.Contains(t.ID)).Select(m => m.DEPARTMENT_TYPE).Distinct().ToList();
@ -1578,15 +1575,15 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var ite in departTemps) foreach (var ite in departTemps)
{ {
var departType = "公司级"; var departType = "公司级";
if (ite == 0) if (ite == 10)
{ {
departType = "部门级"; departType = "部门级";
} }
if (ite == 1) if (ite == 15)
{ {
departType = "车间级"; departType = "车间级";
} }
if (ite == 2) if (ite == 20)
{ {
departType = "班组级"; departType = "班组级";
} }
@ -1672,34 +1669,31 @@ namespace APT.PP.WebApi.Controllers.Api
results.Add(result); results.Add(result);
//只汇总部门级所有人的明细 //只汇总部门级所有人的明细
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de).Select(t => t.ID).ToList(); var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList(); var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重 //汇总去重
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
if (detailListYes.Any()) if (detailListYes.Any())
{ {
foreach (var item in detailListYes) foreach (var item in detailListYes)
{ {
var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList(); var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//只取有效的部门岗位 //var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes); var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList(); var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList(); var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList(); T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); ideDetail.ORG_ID = filter.OrgId;
ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; ideDetail.MineType = item.MineType;
ideDetail.MineType = item.Key.MineType; ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.AREA_ID = item.AREA_ID;
ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.RISK_NAME = item.RISK_NAME;
ideDetail.RISK_NAME = item.Key.RISK_NAME; ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID; ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION; ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.TYPE_ID = item.Key.TYPE_ID; ideDetail.MEASURE = item.MEASURE;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE; ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.EMERGENCY = tempYes != null ? tempYes.EMERGENCY : temp[0]?.EMERGENCY; ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.ENABLE_STATUS = tempYes != null ? tempYes.ENABLE_STATUS : temp[0].ENABLE_STATUS;
//ideDetail.DEPARTMENT_TYPE = "岗位级"; //ideDetail.DEPARTMENT_TYPE = "岗位级";
if (departIdss.Any()) if (departIdss.Any())
{ {
@ -1710,15 +1704,15 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var ite in departTemps) foreach (var ite in departTemps)
{ {
var departType = "公司级"; var departType = "公司级";
if (ite == 0) if (ite == 10)
{ {
departType = "部门级"; departType = "部门级";
} }
if (ite == 1) if (ite == 15)
{ {
departType = "车间级"; departType = "车间级";
} }
if (ite == 2) if (ite == 20)
{ {
departType = "班组级"; departType = "班组级";
} }
@ -1809,34 +1803,31 @@ namespace APT.PP.WebApi.Controllers.Api
result.REQUIRE_ID = requre?.ID; result.REQUIRE_ID = requre?.ID;
results.Add(result); results.Add(result);
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de || classIds.Contains((Guid)m.APPLY_DEPARTMENT_ID)).Select(t => t.ID).ToList(); var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de || classIds.Contains((Guid)m.APPLY_DEPARTMENT_ID)).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList(); var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重 //汇总去重
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList(); var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
if (detailListYes.Any()) if (detailListYes.Any())
{ {
foreach (var item in detailListYes) foreach (var item in detailListYes)
{ {
var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
//只取有效的部门岗位 var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes); var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList(); var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList(); var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList(); T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); ideDetail.ORG_ID = filter.OrgId;
ideDetail.ORG_ID = filter.OrgId; ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID; ideDetail.MineType = item.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; ideDetail.AREA_ID = item.AREA_ID;
ideDetail.MineType = item.Key.MineType; ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.Key.AREA_ID; ideDetail.RISK_NAME = item.RISK_NAME;
ideDetail.RISK_NAME = item.Key.RISK_NAME; ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID; ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION; ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.TYPE_ID = item.Key.TYPE_ID; ideDetail.MEASURE = item.MEASURE;
ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE; ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.EMERGENCY = tempYes != null ? tempYes.EMERGENCY : temp[0]?.EMERGENCY; ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.ENABLE_STATUS = tempYes != null ? tempYes.ENABLE_STATUS : temp[0].ENABLE_STATUS;
//ideDetail.DEPARTMENT_TYPE = "岗位级"; //ideDetail.DEPARTMENT_TYPE = "岗位级";
if (departIdss.Any()) if (departIdss.Any())
{ {
@ -1847,15 +1838,15 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var ite in departTemps) foreach (var ite in departTemps)
{ {
var departType = "公司级"; var departType = "公司级";
if (ite == 0) if (ite == 10)
{ {
departType = "部门级"; departType = "部门级";
} }
if (ite == 1) if (ite == 15)
{ {
departType = "车间级"; departType = "车间级";
} }
if (ite == 2) if (ite == 20)
{ {
departType = "班组级"; departType = "班组级";
} }

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

@ -74,18 +74,11 @@ namespace APT.SK.WebApi.Controllers.Api
deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); 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) 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); var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
if (temp == null) && t.EMERGENCY == item.EMERGENCY);
if (temp == null && item.MARK != SKMarkEnum.Add)
{ {
item.MARK = SKMarkEnum.Add; item.MARK = SKMarkEnum.Update;
}
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 =>

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

@ -76,18 +76,11 @@ namespace APT.SK.WebApi.Controllers.Api
//}); //});
foreach (var item in details) 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); var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
if (temp == null) && t.EMERGENCY == item.EMERGENCY);
if (temp == null && item.MARK != SKMarkEnum.Add)
{ {
item.MARK = SKMarkEnum.Add; item.MARK = SKMarkEnum.Update;
}
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;
}
} }
} }
} }

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

@ -93,18 +93,11 @@ namespace APT.SK.WebApi.Controllers.Api
//}); //});
foreach (var item in details) 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); var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
if (temp == null) && t.EMERGENCY == item.EMERGENCY && t.DEPARTMENT_TYPE == item.DEPARTMENT_TYPE && t.IDENTIFY_DEPARTMENT == item.IDENTIFY_DEPARTMENT && t.IDENTIFY_POST == item.IDENTIFY_POST);
if (temp == null && item.MARK != SKMarkEnum.Add)
{ {
item.MARK = SKMarkEnum.Add; item.MARK = SKMarkEnum.Update;
}
else
{
if (temp.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
|| temp.EMERGENCY != item.EMERGENCY || temp.DEPARTMENT_TYPE != item.DEPARTMENT_TYPE || temp.IDENTIFY_DEPARTMENT != item.IDENTIFY_DEPARTMENT || temp.IDENTIFY_POST != item.IDENTIFY_POST))
{
item.MARK = SKMarkEnum.Update;
}
} }
} }
} }