diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 947f894..e97ce22 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -3471,7 +3471,8 @@ namespace APT.PP.WebApi.Controllers.Api { endtime = DateTime.Now.AddMonths(3); } - var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + "安全检查通知" + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); + var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CHECK_TYPE_ID); + var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + checkType?.NAME + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); notices.Add(notice); } } @@ -3547,7 +3548,8 @@ namespace APT.PP.WebApi.Controllers.Api { endtime = DateTime.Now.AddMonths(3); } - var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + "安全检查通知" + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); + var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CHECK_TYPE_ID); + var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + checkType?.NAME + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); notices.Add(notice); } } @@ -5584,7 +5586,8 @@ namespace APT.PP.WebApi.Controllers.Api { endtime = DateTime.Now.AddMonths(3); } - var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + "安全检查通知" + date, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); + var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CheckTypeId); + var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + checkType?.NAME + date, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); notices.Add(notice); j++; } @@ -5838,6 +5841,7 @@ namespace APT.PP.WebApi.Controllers.Api { dt = DateTime.Parse(filter.Parameter1); } + var checkTypes = GetEntities(i => !i.IS_DELETED, new BaseFilter(filter.OrgId)).ToList(); List notices = new List(); List details = new List(); List tasks = new List(); @@ -5915,7 +5919,8 @@ namespace APT.PP.WebApi.Controllers.Api { endtime = DateTime.Now.AddMonths(3); } - var task = NotificationTaskService.InsertUserNoticeTaskModel(set.CHECK_CYCLE.GetDescription() + "安全检查通知" + date, notice.ID, set.ORG_ID, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); + var checkType = checkTypes.FirstOrDefault(t => t.ID == set.CHECK_TYPE_ID); + var task = NotificationTaskService.InsertUserNoticeTaskModel(set.CHECK_CYCLE.GetDescription() + checkType?.NAME + date, notice.ID, set.ORG_ID, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006"); tasks.Add(task); j++; }