问题等级 【ABCD】等级修改为【非重大】
默认整改天数 非重大 取之前A级的信息
This commit is contained in:
parent
2249b46bb5
commit
430212d1b3
@ -457,18 +457,21 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
case (int)BSQuestionLevelEnum.重大:
|
case (int)BSQuestionLevelEnum.重大:
|
||||||
delayDays = (int)BSDelayDaysEnum.重大;
|
delayDays = (int)BSDelayDaysEnum.重大;
|
||||||
break;
|
break;
|
||||||
case (int)BSQuestionLevelEnum.A:
|
case (int)BSQuestionLevelEnum.非重大:
|
||||||
delayDays = (int)BSDelayDaysEnum.A;
|
delayDays = (int)BSDelayDaysEnum.A;
|
||||||
break;
|
break;
|
||||||
case (int)BSQuestionLevelEnum.B:
|
//case (int)BSQuestionLevelEnum.A:
|
||||||
delayDays = (int)BSDelayDaysEnum.B;
|
// delayDays = (int)BSDelayDaysEnum.A;
|
||||||
break;
|
// break;
|
||||||
case (int)BSQuestionLevelEnum.C:
|
//case (int)BSQuestionLevelEnum.B:
|
||||||
delayDays = (int)BSDelayDaysEnum.C;
|
// delayDays = (int)BSDelayDaysEnum.B;
|
||||||
break;
|
// break;
|
||||||
case (int)BSQuestionLevelEnum.D:
|
//case (int)BSQuestionLevelEnum.C:
|
||||||
delayDays = (int)BSDelayDaysEnum.D;
|
// delayDays = (int)BSDelayDaysEnum.C;
|
||||||
break;
|
// break;
|
||||||
|
//case (int)BSQuestionLevelEnum.D:
|
||||||
|
// delayDays = (int)BSDelayDaysEnum.D;
|
||||||
|
// break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -5360,7 +5363,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
fileIds.Add(file.IMG_FILE_ID);
|
fileIds.Add(file.IMG_FILE_ID);
|
||||||
}
|
}
|
||||||
DepartmentService.AddDocument("风险管理", "年度风险评价计划审核表", "年度风险评价计划", "附件", "计划文件", DateTime.Now.AddYears(1), entity.ID, fileIds, entity.RELEASE_USER_ID);
|
DepartmentService.AddDocument("风险管理", "年度风险评价计划审核表", "年度风险评价计划", "附件", "计划文件", DateTime.Now.AddYears(1), entity.ID, fileIds, entity.RELEASE_USER_ID);
|
||||||
|
|
||||||
if (orgId == Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))//行洛坑
|
if (orgId == Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))//行洛坑
|
||||||
{
|
{
|
||||||
sendUser = (Guid)GetEntity<T_FM_DEPARTMENT>(t => t.NAME == "办公室").USER_ID;
|
sendUser = (Guid)GetEntity<T_FM_DEPARTMENT>(t => t.NAME == "办公室").USER_ID;
|
||||||
@ -5529,7 +5532,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
hazardTask.ORG_ID = entity.ORG_ID;
|
hazardTask.ORG_ID = entity.ORG_ID;
|
||||||
hazardTask.LIABLE_USER_ID = hazardDetail.CHARGE_USER_ID;
|
hazardTask.LIABLE_USER_ID = hazardDetail.CHARGE_USER_ID;
|
||||||
hazardTask.PLAN_ID = entity.ID;
|
hazardTask.PLAN_ID = entity.ID;
|
||||||
foreach(var t in hazardDetail.Nav_Areas)
|
foreach (var t in hazardDetail.Nav_Areas)
|
||||||
{
|
{
|
||||||
T_HM_HAZARD_TASK_AREA area = new T_HM_HAZARD_TASK_AREA();
|
T_HM_HAZARD_TASK_AREA area = new T_HM_HAZARD_TASK_AREA();
|
||||||
area.ORG_ID = entity.ORG_ID;
|
area.ORG_ID = entity.ORG_ID;
|
||||||
@ -5547,7 +5550,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
BaseFilter hazardfilter = new BaseFilter(orgId);
|
BaseFilter hazardfilter = new BaseFilter(orgId);
|
||||||
hazardfilter.SelectField = new string[] { "IDENTIFYING_ID" };
|
hazardfilter.SelectField = new string[] { "IDENTIFYING_ID" };
|
||||||
var hazarddb = GetEntities<T_HM_EVALUATE_HAZARD>(t => t.AREA_ID == t.AREA_ID && t.STATUS == 0, hazardfilter);
|
var hazarddb = GetEntities<T_HM_EVALUATE_HAZARD>(t => t.AREA_ID == t.AREA_ID && t.STATUS == 0, hazardfilter);
|
||||||
foreach(var hazard in hazarddb)
|
foreach (var hazard in hazarddb)
|
||||||
{
|
{
|
||||||
T_HM_HAZARD_TASK_DETAIL_IDENTIFYING taskDetailIdentify = new T_HM_HAZARD_TASK_DETAIL_IDENTIFYING();
|
T_HM_HAZARD_TASK_DETAIL_IDENTIFYING taskDetailIdentify = new T_HM_HAZARD_TASK_DETAIL_IDENTIFYING();
|
||||||
taskDetailIdentify.ORG_ID = entity.ORG_ID;
|
taskDetailIdentify.ORG_ID = entity.ORG_ID;
|
||||||
@ -5576,7 +5579,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
noticeEndTime.Add(DateTime.Parse(hazardTask.END_TIME.ToShortDateString() + " 23:59:59"));
|
noticeEndTime.Add(DateTime.Parse(hazardTask.END_TIME.ToShortDateString() + " 23:59:59"));
|
||||||
hazards.Add(hazardTask);
|
hazards.Add(hazardTask);
|
||||||
}
|
}
|
||||||
sendNoticeList = NotificationTaskService.InsertUserNoticeTaskModels( noticeTitles, noticeDataIds, entity.ORG_ID, noticeUserIds, noticeUserNames, DateTime.Now, noticeEndTime, (int)FMNoticeTypeEnum.消息, noticeFormCodes);
|
sendNoticeList = NotificationTaskService.InsertUserNoticeTaskModels(noticeTitles, noticeDataIds, entity.ORG_ID, noticeUserIds, noticeUserNames, DateTime.Now, noticeEndTime, (int)FMNoticeTypeEnum.消息, noticeFormCodes);
|
||||||
this.UnifiedCommit(() =>
|
this.UnifiedCommit(() =>
|
||||||
{
|
{
|
||||||
if (entity != null)
|
if (entity != null)
|
||||||
@ -7212,17 +7215,20 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
case (int)BSQuestionLevelEnum.重大:
|
case (int)BSQuestionLevelEnum.重大:
|
||||||
delayDays = (int)BSDelayDaysEnum.重大;
|
delayDays = (int)BSDelayDaysEnum.重大;
|
||||||
break;
|
break;
|
||||||
case (int)BSQuestionLevelEnum.A:
|
case (int)BSQuestionLevelEnum.非重大:
|
||||||
delayDays = (int)BSDelayDaysEnum.A;
|
delayDays = (int)BSDelayDaysEnum.A;
|
||||||
break;
|
break;
|
||||||
case (int)BSQuestionLevelEnum.B:
|
//case (int)BSQuestionLevelEnum.A:
|
||||||
delayDays = (int)BSDelayDaysEnum.B;
|
// delayDays = (int)BSDelayDaysEnum.A;
|
||||||
break;
|
// break;
|
||||||
case (int)BSQuestionLevelEnum.C:
|
//case (int)BSQuestionLevelEnum.B:
|
||||||
delayDays = (int)BSDelayDaysEnum.C;
|
// delayDays = (int)BSDelayDaysEnum.B;
|
||||||
break;
|
// break;
|
||||||
case (int)BSQuestionLevelEnum.D:
|
//case (int)BSQuestionLevelEnum.C:
|
||||||
delayDays = (int)BSDelayDaysEnum.D;
|
// delayDays = (int)BSDelayDaysEnum.C;
|
||||||
|
// break;
|
||||||
|
//case (int)BSQuestionLevelEnum.D:
|
||||||
|
// delayDays = (int)BSDelayDaysEnum.D;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -39,10 +39,11 @@ namespace APT.MS.Domain.Enums
|
|||||||
//D = 4,
|
//D = 4,
|
||||||
|
|
||||||
重大 = 10,
|
重大 = 10,
|
||||||
A = 20,
|
非重大 = 20,
|
||||||
B = 30,
|
//A = 20,
|
||||||
C = 40,
|
//B = 30,
|
||||||
D = 50,
|
//C = 40,
|
||||||
|
//D = 50,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -998,17 +998,20 @@ namespace APT.BS.WebApi.Controllers.Api
|
|||||||
case (int)BSQuestionLevelEnum.重大:
|
case (int)BSQuestionLevelEnum.重大:
|
||||||
delayDays = (int)BSDelayDaysEnum.重大;
|
delayDays = (int)BSDelayDaysEnum.重大;
|
||||||
break;
|
break;
|
||||||
case (int)BSQuestionLevelEnum.A:
|
case (int)BSQuestionLevelEnum.非重大:
|
||||||
delayDays = (int)BSDelayDaysEnum.A;
|
delayDays = (int)BSDelayDaysEnum.A;
|
||||||
break;
|
break;
|
||||||
case (int)BSQuestionLevelEnum.B:
|
//case (int)BSQuestionLevelEnum.A:
|
||||||
delayDays = (int)BSDelayDaysEnum.B;
|
// delayDays = (int)BSDelayDaysEnum.A;
|
||||||
break;
|
// break;
|
||||||
case (int)BSQuestionLevelEnum.C:
|
//case (int)BSQuestionLevelEnum.B:
|
||||||
delayDays = (int)BSDelayDaysEnum.C;
|
// delayDays = (int)BSDelayDaysEnum.B;
|
||||||
break;
|
// break;
|
||||||
case (int)BSQuestionLevelEnum.D:
|
//case (int)BSQuestionLevelEnum.C:
|
||||||
delayDays = (int)BSDelayDaysEnum.D;
|
// delayDays = (int)BSDelayDaysEnum.C;
|
||||||
|
// break;
|
||||||
|
//case (int)BSQuestionLevelEnum.D:
|
||||||
|
// delayDays = (int)BSDelayDaysEnum.D;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user