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 e463dbb..b840617 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs @@ -165,17 +165,22 @@ namespace APT.SC.WebApi.Controllers.Api.SE #endregion var allDepartment = Nav_NewUserDetail.Where(t => t.IS_DELETED == false).Select(t => t.USER_DEPARTMENT_ID); var allUser = GetEntities(t => allDepartment.Contains(t.DEPARTMENT_ID) && t.Nav_ApproveRole != null, new BaseFilter(entity.ORG_ID)); + index = 1; if (entity.IS_CREATETEST == SETrainNeedSuvey.否) { foreach (var item in Nav_NewUserDetail) { if (string.IsNullOrEmpty(item.SCORE)) { - throw new Exception("线下考试请填写分数!"); + throw new Exception("线下考试请填写分数,行【" + index + "】!"); + } + if (!item.EXAMINATION_RESULTS.HasValue) + { + throw new Exception("线下考试请完善考核结果,行【" + index + "】!"); } if (item.Nav_Files == null) { - throw new Exception("线下考试请上传附件!"); + throw new Exception("线下考试请上传附件,行【" + index + "】!"); } if (item.Nav_Files != null && item.Nav_Files.Count() > 0) { @@ -186,6 +191,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE detailFiles.AddRange(item.Nav_Files); item.Nav_Files = null; } + index++; } } var listUserID = Nav_NewUserDetail.Where(e => e.USER_ID.HasValue).Select(e => e.USER_ID.Value); @@ -297,6 +303,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE List userDetailList = null; T_SE_NEW_USER_DETAIL currDetail = null; T_FM_NOTIFICATION_TASK sendNoticeRef = null; + T_FM_NOTIFICATION_TASK sendNoticeRefZRZ = null;//安全生产责任制签订 T_OG_SAFE_PDT_SIGNED signRecord = null; T_OG_SAFE_PDT_SIGNED_POST signPost = null; @@ -451,7 +458,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE #region wyw 如果没有继续触发下一级 直接触发 安全生产责任制签订 OG001_SHOWPRINT 如果找不到对应的责任制 就给对应组织安全员(或班长) 触发今日提醒 - GetOG001(taskID, currUser, currPerson, departInfo, ref signRecord, ref signPost, ref sendNoticeRef); + GetOG001(taskID, currUser, currPerson, departInfo, ref signRecord, ref signPost, ref sendNoticeRefZRZ); //if (sendNoticeRef == null) @@ -555,6 +562,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE UpdateEntityNoCommit(signRecord); if (signPost != null) UpdateEntityNoCommit(signPost); + if (sendNoticeRefZRZ != null) + UpdateEntityNoCommit(sendNoticeRefZRZ); }); return true; }); @@ -1182,6 +1191,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE //找不到 责任制 T_FM_USER sendUser = null; var userApprol = GetEntities(e => e.ENABLE_STATUS == 0 && e.DEPARTMENT_ID.HasValue && e.APPROVE_ROLE_ID.HasValue && e.DEPARTMENT_ID.Value == currUser.DEPARTMENT_ID.Value, null, "Nav_ApproveRole"); + if (departInfo == null && currUser.DEPARTMENT_ID.HasValue) + { + departInfo = GetEntity(currUser.DEPARTMENT_ID.Value); + } if (userApprol != null && userApprol.Count() > 0 && currPerson.POST_ID.HasValue) { switch (departInfo.DEPARTMENT_TYPE)//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3