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 10:01:49 +08:00
parent c52165c765
commit 7f4a31f4fe
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12371,7 +12371,12 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK033"); var endDate = DateTime.Now.AddHours(24);
if (entity.END_DATE != null)
{
endDate = Convert.ToDateTime(entity.END_DATE.ToString().Replace("0:00:00", "23:59:59"));
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, endDate, (int)FMNoticeTypeEnum.消息, "SK033");
notices.Add(noticeTask); notices.Add(noticeTask);
} }
} }

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

@ -1151,7 +1151,11 @@ namespace APT.PP.WebApi.Controllers.Api
} }
} }
} }
var endtime = plan.END_DATE != null ? (DateTime)plan.END_DATE : DateTime.Now.AddDays(1); var endtime = DateTime.Now.AddHours(24);
if (plan.END_DATE != null)
{
endtime = Convert.ToDateTime(plan.END_DATE.ToString().Replace("0:00:00", "23:59:59"));
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033"); var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033");
notices.Add(noticeTask); notices.Add(noticeTask);
} }
@ -1401,7 +1405,11 @@ namespace APT.PP.WebApi.Controllers.Api
} }
} }
} }
var endtime = plan.END_DATE != null ? (DateTime)plan.END_DATE : DateTime.Now.AddDays(1); var endtime = DateTime.Now.AddHours(24);
if (plan.END_DATE != null)
{
endtime = Convert.ToDateTime(plan.END_DATE.ToString().Replace("0:00:00", "23:59:59"));
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033"); var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033");
notices.Add(noticeTask); notices.Add(noticeTask);
//} //}

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

@ -630,6 +630,7 @@ 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.Include.Add("Nav_ProductionUnit");
pageFilter.SelectField.Add("Nav_ProductionUnit.NAME");
pageFilter.SelectField.Add("Nav_Details.NUM"); 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");