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:
wyw 2025-11-26 17:11:28 +08:00
commit a87b769975
5 changed files with 92 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -659,7 +659,7 @@ namespace APT.FO.WebApi.Controllers
{ {
var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType; var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
var tempList = mineType.Split(",").ToList(); var tempList = mineType.Split(",").ToList();
var analyze = GetEntity<T_HM_OPERATION_LINK>(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用 && tempList.Contains(t.MineType.ToString()),new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" }); var analyze = GetEntity<T_HM_OPERATION_LINK>(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用,new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" });
if (analyze!=null) if (analyze!=null)
{ {
main.AUDIT_LEVEL=analyze.AUDIT_LEVEL; main.AUDIT_LEVEL=analyze.AUDIT_LEVEL;

52
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -187,32 +187,32 @@ namespace APT.FO.WebApi.Controllers
{ {
throw new Exception("动火操作人员必须上传附件"); throw new Exception("动火操作人员必须上传附件");
} }
var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员");
if (wjUser == null) //if (wjUser == null)
{ //{
throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别");
} //}
else //else
{ //{
var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID);
if (wjUserHas == null) // if (wjUserHas == null)
{ // {
throw new Exception("作业人员必须要有瓦检员"); // throw new Exception("作业人员必须要有瓦检员");
} // }
} //}
var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员");
if (psUser == null) //if (psUser == null)
{ //{
throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别");
} //}
else //else
{ //{
var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID);
if (psUserHas == null) // if (psUserHas == null)
{ // {
throw new Exception("作业人员必须要有喷水人员"); // throw new Exception("作业人员必须要有喷水人员");
} // }
} //}
foreach (var item in users) foreach (var item in users)
{ {
item.ORG_ID = entity.ORG_ID; item.ORG_ID = entity.ORG_ID;

54
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
View File

@ -191,37 +191,37 @@ namespace APT.FO.WebApi.Controllers
{ {
throw new Exception("动火操作人员必须填写证书编号"); throw new Exception("动火操作人员必须填写证书编号");
} }
var dhfiles = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID &&(t.Nav_UserFiles == null || !t.Nav_UserFiles.Any())); var dhfiles = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID && (t.Nav_UserFiles == null || !t.Nav_UserFiles.Any()));
if (dhfiles != null) if (dhfiles != null)
{ {
throw new Exception("动火操作人员必须上传附件"); throw new Exception("动火操作人员必须上传附件");
} }
var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员");
if (wjUser == null) //if (wjUser == null)
{ //{
throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别");
} //}
else //else
{ //{
var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID);
if (wjUserHas == null) // if (wjUserHas == null)
{ // {
throw new Exception("作业人员必须要有瓦检员"); // throw new Exception("作业人员必须要有瓦检员");
} // }
} //}
var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员");
if (psUser == null) //if (psUser == null)
{ //{
throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别");
} //}
else //else
{ //{
var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID);
if (psUserHas == null) // if (psUserHas == null)
{ // {
throw new Exception("作业人员必须要有喷水人员"); // throw new Exception("作业人员必须要有喷水人员");
} // }
} //}
foreach (var item in users) foreach (var item in users)
{ {
item.ORG_ID = entity.ORG_ID; item.ORG_ID = entity.ORG_ID;

5
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

@ -316,6 +316,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye); finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye);
} }
} }
if (entity.CLASS_ID == null)
{
entity.START_TIME = DateTime.Now;
entity.END_TIME = entity.START_TIME.AddHours(24);
}
entity.Nav_User = null; entity.Nav_User = null;
users.ForEach(t => t.Nav_User = null); users.ForEach(t => t.Nav_User = null);
users.ForEach(t => t.ORG_ID = entity.ORG_ID); users.ForEach(t => t.ORG_ID = entity.ORG_ID);

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

@ -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);
}); });