From 7f4a31f4fed8c4a8625700a817dd39f1bd0d5bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 22 Oct 2025 10:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 7 ++++++- .../APT.PP.WebApi/Controllers/Api/SKController.cs | 12 ++++++++++-- .../Controllers/Api/EnterpriseLibraryController.cs | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index dfb21a8..3e6faef 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -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); } } diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 8465206..2cd7267 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -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"); 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"); notices.Add(noticeTask); //} diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index a570e4f..02b844c 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -630,6 +630,7 @@ namespace APT.SK.WebApi.Controllers.Api pageFilter.Include.Add("Nav_RiskName"); pageFilter.Include.Add("Nav_Details"); pageFilter.Include.Add("Nav_ProductionUnit"); + pageFilter.SelectField.Add("Nav_ProductionUnit.NAME"); pageFilter.SelectField.Add("Nav_Details.NUM"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); var users = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person");