diff --git a/APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT.cs b/APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT.cs index 8e55a2b..d926fde 100644 --- a/APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT.cs +++ b/APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT.cs @@ -46,6 +46,7 @@ namespace APT.BaseData.Domain.Entities.FM /// /// 部门层级 FMDepartmentType 公司=5 部门=10, 车间=15, 班组=20, + /// FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 /// [Description("部门层级")] [EnumName("FMDepartmentType")] diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs index a498911..761d967 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs @@ -266,7 +266,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP { var endTime = DateTime.Now.AddDays(10); var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59); - sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel(DateTime.Now.ToShortDateString() + "-三级安全培训-" + eduCard.STATUS.GetDescription(), eduCard.ID, eduCard.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE062")); + sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel(currTime.ToString("MMdd") + "-三级安全培训-" + eduCard.STATUS.GetDescription(), eduCard.ID, eduCard.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE062")); } T_FM_SYNC_TASK task = null; if (!string.IsNullOrEmpty(filter.Parameter1) && eduCard != null) 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 83fba74..69f4d7c 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs @@ -65,13 +65,21 @@ namespace APT.SC.WebApi.Controllers.Api.SE var currUserDepId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var auditDep = GetEntity(currUserDepId.ToString()); - var listCode = Nav_NewUserDetail.Where(e => e.CODE.Length > 0).Select(e => e.CODE); - var listUserCheck = GetEntities(e => listCode.Contains(e.CODE), null, null); + //var listCode = Nav_NewUserDetail.Where(e => e.CODE.Length > 0).Select(e => e.CODE); + //var listUserCheck = GetEntities(e => listCode.Contains(e.CODE), null, null); + + var listCode = Nav_NewUserDetail.Where(e => e.CODE != null).Where(e => e.CODE.Length > 0).Select(e => e.CODE); + IEnumerable listUserCheck = null; + if (listCode != null && listCode.Count() > 0) + { + listUserCheck = GetEntities(e => listCode.Contains(e.CODE), null, null); + } foreach (var item in Nav_NewUserDetail) { var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID); - if (dep.DEPARTMENT_TYPE == auditDep.DEPARTMENT_TYPE) + //if (dep.DEPARTMENT_TYPE == auditDep.DEPARTMENT_TYPE)//登录者的层级 等于 新用户的层级 + if (dep.DEPARTMENT_TYPE <= auditDep.DEPARTMENT_TYPE)//登录者的层级 小于 新用户的层级 { if (string.IsNullOrEmpty(item.CODE)) { @@ -95,16 +103,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE { foreach (var item in Nav_NewUserDetail) { + /// 部门层级 FMDepartmentType 公司=5 部门=10, 车间=15, 班组=20, + /// FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID); - if (dep.DEPARTMENT_TYPE == 0) + if (dep.DEPARTMENT_TYPE == 10) { item.NEXT_DEPARTMENT_ID = dep.ID; } - if (dep.DEPARTMENT_TYPE == 1) + if (dep.DEPARTMENT_TYPE == 15) { item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID; } - else if (dep.DEPARTMENT_TYPE == 2) + else if (dep.DEPARTMENT_TYPE == 20) { item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID; } @@ -166,12 +176,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE BantchSaveEntityNoCommit(Nav_Files); if (detailFiles.Any()) BantchSaveEntityNoCommit(detailFiles); - }); - - - return true; }); } @@ -836,7 +842,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE public void GetOG001(Guid TaskID, T_FM_USER currUser, T_FM_PERSON currPerson, T_FM_DEPARTMENT departInfo, ref T_OG_SAFE_PDT_SIGNED signRecord, ref T_OG_SAFE_PDT_SIGNED_POST signPost, ref T_FM_NOTIFICATION_TASK sendNoticeRef) { // 如果没有继续触发下一级 直接触发 安全生产责任制签订 OG001_SHOWPRINT 如果找不到对应的责任制 就给对应组织安全员(或班长) 触发今日提醒 - if (sendNoticeRef == null) + if (sendNoticeRef == null && currPerson.POST_ID.HasValue)//&& currPerson.POST_ID.HasValue 三级安全教育的没填 岗位 { var post = GetEntity(t => t.Nav_Dept.DEPARTMENT_ID == currUser.DEPARTMENT_ID && t.DEPOST_ID == currPerson.POST_ID, new string[] { "Nav_Dept.Nav_Post" }); if (post != null)