wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:5dc571229a36f47bb1b25f46ed80ff7ed8118f96
Branches Tags
wyw:master
..
compare: wyw:46f1b35a49e7191961615b40f658db7568d20ace
Branches Tags
wyw:master

No commits in common. "5dc571229a36f47bb1b25f46ed80ff7ed8118f96" and "46f1b35a49e7191961615b40f658db7568d20ace" have entirely different histories.
5dc571229a ... 46f1b35a49

2 changed files with 2 additions and 30 deletions
Show Stats Expand all files Collapse all files

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs
View File

@ -58,9 +58,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
throw new Exception("截止时间至少比发起时间要大于一天"); throw new Exception("截止时间至少比发起时间要大于一天");
} }
if (Demands == null || !Demands.Any() || Demands.Count() < 1 || Demands.Where(e => !e.IS_DELETED).Count() < 1) if (Demands == null || !Demands.Any() || Demands.Count() < 1)
{ {
throw new Exception("请添加调查人员信息！"); throw new Exception("请添加培训人员信息！");
} }
if (entity.LAUNCH_USER_ID == Guid.Empty) if (entity.LAUNCH_USER_ID == Guid.Empty)
{ {

28
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs
View File

@ -242,16 +242,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
userFilter.Include = new string[] { "Nav_Person.Nav_Post", "Nav_Department" }; userFilter.Include = new string[] { "Nav_Person.Nav_Post", "Nav_Department" };
IEnumerable<T_FM_USER> userNames = GetEntities<T_FM_USER>(t => sendUserAll.Contains(t.ID), userFilter); IEnumerable<T_FM_USER> userNames = GetEntities<T_FM_USER>(t => sendUserAll.Contains(t.ID), userFilter);
//List<Guid> listAuto = new List<Guid>();
//if (entity.RECORD_USER_ID.HasValue && sendUsers.Contains(entity.RECORD_USER_ID.Value))
//{
// listAuto.Add(entity.RECORD_USER_ID.Value);
//}
//if (entity.USER_ID_TEACHER.HasValue && !listAuto.Contains(entity.USER_ID_TEACHER.Value))
//{
// listAuto.Add(entity.USER_ID_TEACHER.Value);
//}
T_FM_USER userCheck = null; T_FM_USER userCheck = null;
foreach (var user in Nav_TrainUserList) foreach (var user in Nav_TrainUserList)
{ {
@ -285,11 +275,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
user.DEPARTMENT_NAME = userCheck.Nav_Department?.NAME; user.DEPARTMENT_NAME = userCheck.Nav_Department?.NAME;
user.POST_NAME = userCheck.Nav_Person?.Nav_Post?.NAME; user.POST_NAME = userCheck.Nav_Person?.Nav_Post?.NAME;
//if (listAuto != null && listAuto.Count > 0 && listAuto.Contains(user.USER_ID))
//{
// user.IS_LEAVE = SETrainYesNoEnum.参加;
//}
} }
foreach (var user in sendUsers) foreach (var user in sendUsers)
{ {
@ -304,19 +289,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
sendNoticeTask = NotificationTaskService.InsertUserNoticeTaskModels("培训通知-" + entity.NAME + "-确认", entity.ID, entity.ORG_ID, sendUsers, allSendUserNames, DateTime.Now, DateTime.Now.AddDays(1), (int)FMNoticeTypeEnum.消息, "SE013_SHOWPRINT"); sendNoticeTask = NotificationTaskService.InsertUserNoticeTaskModels("培训通知-" + entity.NAME + "-确认", entity.ID, entity.ORG_ID, sendUsers, allSendUserNames, DateTime.Now, DateTime.Now.AddDays(1), (int)FMNoticeTypeEnum.消息, "SE013_SHOWPRINT");
//if (listAuto != null && listAuto.Count > 0)
//{
// foreach (var item in sendNoticeTask)
// {
// if (listAuto.Contains(item.USER_ID))
// {
// item.NOTICE_STATUS = 1;
// item.TASK_DT = DateTime.Now;
// item.MODIFIER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
// }
// }
//}
} }
else else
{ {