diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs index ccb072c..bc8583f 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -95,15 +95,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE throw new Exception("该用户已有此签到单,请勿重复触发签到通知!"); } } - DateTime dtEnd = ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.HasValue ? ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.Value : DateTime.Now.AddHours(12); - T_FM_NOTIFICATION_TASK notice = NotificationTaskService.InsertUserNoticeTaskModel("培训记录签到-" + ru.Nav_Record.Nav_Notify.NAME, ru.RECORD_ID, ru.ORG_ID, ru.USER_ID, ru.Nav_User.NAME, DateTime.Now, dtEnd, 1, "SE017_SHOWPRINT"); - ru.IS_RESEND = true; - //ru.Nav_Record = null;//有这句会报错 - UnifiedCommit(() => + else { - AddEntityNoCommit(notice); - UpdateEntityNoCommit(ru); - }); + DateTime dtEnd = ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.HasValue ? ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.Value : DateTime.Now.AddHours(12); + T_FM_NOTIFICATION_TASK notice = NotificationTaskService.InsertUserNoticeTaskModel("培训记录签到-" + ru.Nav_Record.Nav_Notify.NAME, ru.RECORD_ID, ru.ORG_ID, ru.USER_ID, ru.Nav_User.NAME, DateTime.Now, dtEnd, 1, "SE017_SHOWPRINT"); + ru.IS_RESEND = true; + //ru.Nav_Record = null;//有这句会报错 + UnifiedCommit(() => + { + AddEntityNoCommit(notice); + UpdateEntityNoCommit(ru); + }); + } return true; }); } @@ -146,6 +149,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE } if (model.ISSTOPSIGN != true) { + + var listTaskCancle = GetEntities(e => e.SOURCE_DATA_ID == RecordID && e.SOURCE_FORMCODE == "SE017_SHOWPRINT" && e.NOTICE_STATUS == 0 && e.NOTICE_TITLE.StartsWith("培训记录签到-"), null, null); + if (listTaskCancle != null && listTaskCancle.Count() > 0) + { + listTaskCancle.ForEach(e => + { + e.TASK_DT = DateTime.Now; + e.NOTICE_STATUS = 4; + e.MODIFY_TIME = DateTime.Now; + e.MODIFIER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + }); + } model.ISSTOPSIGN = true; model.MODIFY_TIME = DateTime.Now; @@ -170,6 +185,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE UpdateEntityNoCommit(model); if (listNotSign != null && listNotSign.Count() > 0) BantchSaveEntityNoCommit(listNotSign); + if (listTaskCancle != null && listTaskCancle.Count() > 0) + BantchSaveEntityNoCommit(listTaskCancle); }); } return true;