检查通知待办名称修改
This commit is contained in:
parent
81d2d4f51a
commit
8262ddffbf
@ -3471,7 +3471,8 @@ namespace APT.PP.WebApi.Controllers.Api
|
|||||||
{
|
{
|
||||||
endtime = DateTime.Now.AddMonths(3);
|
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);
|
notices.Add(notice);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3547,7 +3548,8 @@ namespace APT.PP.WebApi.Controllers.Api
|
|||||||
{
|
{
|
||||||
endtime = DateTime.Now.AddMonths(3);
|
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);
|
notices.Add(notice);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5584,7 +5586,8 @@ namespace APT.PP.WebApi.Controllers.Api
|
|||||||
{
|
{
|
||||||
endtime = DateTime.Now.AddMonths(3);
|
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);
|
notices.Add(notice);
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
@ -5838,6 +5841,7 @@ namespace APT.PP.WebApi.Controllers.Api
|
|||||||
{
|
{
|
||||||
dt = DateTime.Parse(filter.Parameter1);
|
dt = DateTime.Parse(filter.Parameter1);
|
||||||
}
|
}
|
||||||
|
var checkTypes = GetEntities<T_SK_CHECK_TYPE>(i => !i.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
|
||||||
List<T_SK_SECURITY_INSPECTION_NOTICE> notices = new List<T_SK_SECURITY_INSPECTION_NOTICE>();
|
List<T_SK_SECURITY_INSPECTION_NOTICE> notices = new List<T_SK_SECURITY_INSPECTION_NOTICE>();
|
||||||
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL> details = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
|
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL> details = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
|
||||||
List<T_FM_NOTIFICATION_TASK> tasks = new List<T_FM_NOTIFICATION_TASK>();
|
List<T_FM_NOTIFICATION_TASK> tasks = new List<T_FM_NOTIFICATION_TASK>();
|
||||||
@ -5915,7 +5919,8 @@ namespace APT.PP.WebApi.Controllers.Api
|
|||||||
{
|
{
|
||||||
endtime = DateTime.Now.AddMonths(3);
|
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);
|
tasks.Add(task);
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user