diff --git a/APT.MS.Domain/Enums/SC/SEEnum.cs b/APT.MS.Domain/Enums/SC/SEEnum.cs index 6efac87..0ac070b 100644 --- a/APT.MS.Domain/Enums/SC/SEEnum.cs +++ b/APT.MS.Domain/Enums/SC/SEEnum.cs @@ -59,7 +59,7 @@ namespace APT.MS.Domain.Enums public enum SENewUserStatus { 草稿 = 0, - 签到中 = 1, + 待确认 = 1,// 签到中 归档 = 2, } /// 考核结果 diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs index 331beee..05dd1bb 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs @@ -223,10 +223,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE { if (!item.USER_ID.HasValue || item.IS_DELETED) continue; - sendNoticeList.Add(NotificationTaskService.InsertUserNoticeTaskModel("三级安全培训记录-" + entity.TRAIN_STATUS.GetDescription() + "-签到", item.ID, entity.ORG_ID, (Guid)item.USER_ID, listUser.FirstOrDefault(e => e.ID == item.USER_ID.Value)?.NAME, DateTime.Now, DateTime.Now.AddDays(1), 1, "SE062_SHOWPRINT")); + sendNoticeList.Add(NotificationTaskService.InsertUserNoticeTaskModel("三级安全培训记录-" + entity.TRAIN_STATUS.GetDescription() + "-确认", item.ID, entity.ORG_ID, (Guid)item.USER_ID, listUser.FirstOrDefault(e => e.ID == item.USER_ID.Value)?.NAME, DateTime.Now, DateTime.Now.AddDays(1), 1, "SE062_SHOWPRINT")); } } finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID, "SE061_SHOWPRINT"); + entity.STATUS = SENewUserStatus.待确认; } else {