2
This commit is contained in:
parent
1483b91663
commit
a15062eaab
@ -79,11 +79,11 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_BASIC> basicList = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_BASIC>();
|
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_BASIC> basicList = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_BASIC>();
|
||||||
if (details != null && details.Any())
|
if (details != null && details.Any())
|
||||||
{
|
{
|
||||||
var first = details.FirstOrDefault(t => t.AREA_ID != entity.RISK_AREA_ID);
|
//var first = details.FirstOrDefault(t => t.AREA_ID != entity.RISK_AREA_ID);
|
||||||
if (first != null && entity.RISK_AREA_ID != null)
|
//if (first != null && entity.RISK_AREA_ID != null)
|
||||||
{
|
//{
|
||||||
throw new Exception("主表的检查区域与子表的辨识区域需保持一致!");
|
// throw new Exception("主表的检查区域与子表的辨识区域需保持一致!");
|
||||||
}
|
//}
|
||||||
detailIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(t => t.DOUBLE_PREVENT_MECHANISM_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
|
detailIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(t => t.DOUBLE_PREVENT_MECHANISM_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
|
||||||
detailPostIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
|
detailPostIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
|
||||||
measureIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
|
measureIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
|
||||||
@ -167,34 +167,34 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
detailPostList.Add(item2);
|
detailPostList.Add(item2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险)
|
//if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险)
|
||||||
{
|
//{
|
||||||
if (!departType.Contains("公司级"))
|
// if (!departType.Contains("公司级"))
|
||||||
{
|
// {
|
||||||
throw new Exception(item.RISK_NAME + ",重大风险管控层级必须包含公司级");
|
// throw new Exception(item.RISK_NAME + ",重大风险管控层级必须包含公司级");
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险)
|
//if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险)
|
||||||
{
|
//{
|
||||||
if (!departType.Contains("部门级") && !departType.Contains("公司级"))
|
// if (!departType.Contains("部门级") && !departType.Contains("公司级"))
|
||||||
{
|
// {
|
||||||
throw new Exception(item.RISK_NAME + ",较大风险管控层级必须大于部门级");
|
// throw new Exception(item.RISK_NAME + ",较大风险管控层级必须大于部门级");
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险)
|
//if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险)
|
||||||
{
|
//{
|
||||||
if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级"))
|
// if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级"))
|
||||||
{
|
// {
|
||||||
throw new Exception(item.RISK_NAME + ",一般风险管控层级必须大于车间级");
|
// throw new Exception(item.RISK_NAME + ",一般风险管控层级必须大于车间级");
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险)
|
//if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险)
|
||||||
{
|
//{
|
||||||
if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级") && !departType.Contains("班组级"))
|
// if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级") && !departType.Contains("班组级"))
|
||||||
{
|
// {
|
||||||
throw new Exception(item.RISK_NAME + ",低风险管控层级必须大于班组级");
|
// throw new Exception(item.RISK_NAME + ",低风险管控层级必须大于班组级");
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
|
if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
|
||||||
{
|
{
|
||||||
foreach (var item2 in item.Nav_DetailDeparts)
|
foreach (var item2 in item.Nav_DetailDeparts)
|
||||||
@ -271,50 +271,22 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
BantchSaveEntityNoCommit(files);
|
BantchSaveEntityNoCommit(files);
|
||||||
if (details != null && details.Any())
|
if (details != null && details.Any())
|
||||||
BantchSaveEntityNoCommit(details);
|
BantchSaveEntityNoCommit(details);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("风险明细不能为空");
|
|
||||||
}
|
|
||||||
if (detailPostList != null && detailPostList.Any())
|
if (detailPostList != null && detailPostList.Any())
|
||||||
BantchSaveEntityNoCommit(detailPostList);
|
BantchSaveEntityNoCommit(detailPostList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("管控层级明细不能为空");
|
|
||||||
}
|
|
||||||
if (detailDepartList != null && detailDepartList.Any())
|
if (detailDepartList != null && detailDepartList.Any())
|
||||||
BantchSaveEntityNoCommit(detailDepartList);
|
BantchSaveEntityNoCommit(detailDepartList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("辨识岗位明细不能为空");
|
|
||||||
}
|
|
||||||
if (departDetailList != null && departDetailList.Any())
|
if (departDetailList != null && departDetailList.Any())
|
||||||
BantchSaveEntityNoCommit(departDetailList);
|
BantchSaveEntityNoCommit(departDetailList);
|
||||||
if (measureList != null && measureList.Any())
|
if (measureList != null && measureList.Any())
|
||||||
BantchSaveEntityNoCommit(measureList);
|
BantchSaveEntityNoCommit(measureList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("管控措施明细不能为空");
|
|
||||||
}
|
|
||||||
if (contentList != null && contentList.Any())
|
if (contentList != null && contentList.Any())
|
||||||
BantchSaveEntityNoCommit(contentList);
|
BantchSaveEntityNoCommit(contentList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("检查内容明细不能为空");
|
|
||||||
}
|
|
||||||
if (hiddenList != null && hiddenList.Any())
|
if (hiddenList != null && hiddenList.Any())
|
||||||
BantchSaveEntityNoCommit(hiddenList);
|
BantchSaveEntityNoCommit(hiddenList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("隐患明细不能为空");
|
|
||||||
}
|
|
||||||
if (basicList != null && basicList.Any())
|
if (basicList != null && basicList.Any())
|
||||||
BantchSaveEntityNoCommit(basicList);
|
BantchSaveEntityNoCommit(basicList);
|
||||||
if (postList != null && postList.Any())
|
if (postList != null && postList.Any())
|
||||||
BantchSaveEntityNoCommit(postList);
|
BantchSaveEntityNoCommit(postList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("检查层级明细不能为空");
|
|
||||||
}
|
|
||||||
if (departList != null && departList.Any())
|
if (departList != null && departList.Any())
|
||||||
BantchSaveEntityNoCommit(departList);
|
BantchSaveEntityNoCommit(departList);
|
||||||
}, null, null, null, null, null, "SK026_SHOWPRINT", null, "风险检查关联表审批");
|
}, null, null, null, null, null, "SK026_SHOWPRINT", null, "风险检查关联表审批");
|
||||||
@ -350,49 +322,22 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
BantchSaveEntityNoCommit(files);
|
BantchSaveEntityNoCommit(files);
|
||||||
if (details != null && details.Any())
|
if (details != null && details.Any())
|
||||||
BantchSaveEntityNoCommit(details);
|
BantchSaveEntityNoCommit(details);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("风险明细不能为空");
|
|
||||||
}
|
|
||||||
if (detailPostList != null && detailPostList.Any())
|
if (detailPostList != null && detailPostList.Any())
|
||||||
BantchSaveEntityNoCommit(detailPostList);
|
BantchSaveEntityNoCommit(detailPostList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("管控层级明细不能为空");
|
|
||||||
}
|
|
||||||
if (detailDepartList != null && detailDepartList.Any())
|
if (detailDepartList != null && detailDepartList.Any())
|
||||||
BantchSaveEntityNoCommit(detailDepartList);
|
BantchSaveEntityNoCommit(detailDepartList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("辨识岗位明细不能为空");
|
|
||||||
}
|
|
||||||
if (departDetailList != null && departDetailList.Any())
|
if (departDetailList != null && departDetailList.Any())
|
||||||
BantchSaveEntityNoCommit(departDetailList);
|
BantchSaveEntityNoCommit(departDetailList);
|
||||||
if (measureList != null && measureList.Any())
|
if (measureList != null && measureList.Any())
|
||||||
BantchSaveEntityNoCommit(measureList);
|
BantchSaveEntityNoCommit(measureList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("管控措施明细不能为空");
|
|
||||||
}
|
|
||||||
if (contentList != null && contentList.Any())
|
if (contentList != null && contentList.Any())
|
||||||
BantchSaveEntityNoCommit(contentList);
|
BantchSaveEntityNoCommit(contentList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("检查内容明细不能为空");
|
|
||||||
}
|
|
||||||
if (hiddenList != null && hiddenList.Any())
|
if (hiddenList != null && hiddenList.Any())
|
||||||
BantchSaveEntityNoCommit(hiddenList);
|
BantchSaveEntityNoCommit(hiddenList);
|
||||||
{
|
|
||||||
throw new Exception("隐患明细不能为空");
|
|
||||||
}
|
|
||||||
if (basicList != null && basicList.Any())
|
if (basicList != null && basicList.Any())
|
||||||
BantchSaveEntityNoCommit(basicList);
|
BantchSaveEntityNoCommit(basicList);
|
||||||
if (postList != null && postList.Any())
|
if (postList != null && postList.Any())
|
||||||
BantchSaveEntityNoCommit(postList);
|
BantchSaveEntityNoCommit(postList);
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("检查层级明细不能为空");
|
|
||||||
}
|
|
||||||
if (departList != null && departList.Any())
|
if (departList != null && departList.Any())
|
||||||
BantchSaveEntityNoCommit(departList);
|
BantchSaveEntityNoCommit(departList);
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user