diff --git a/APT.BaseData.Domain/IServices/FM/IFMUserService.cs b/APT.BaseData.Domain/IServices/FM/IFMUserService.cs index 7452ecc..b14a002 100644 --- a/APT.BaseData.Domain/IServices/FM/IFMUserService.cs +++ b/APT.BaseData.Domain/IServices/FM/IFMUserService.cs @@ -103,5 +103,13 @@ namespace APT.BaseData.Domain.IServices.FM /// 只返回一个人 /// List GetDepPostUser(ref string Msg, Guid DEPARTMENT_ID, Guid POST_ID, bool IsOnly); + + /// + /// 找安环部人员 + /// + /// 1 NUM 从小到大 找第一个 2 NUM 找老大 + /// 1 + /// + T_FM_USER GetSafeApproveUser(Guid ORG_ID, int UserType = 1); } } diff --git a/APT.BaseData.Services/Services/FM/FMUserService.cs b/APT.BaseData.Services/Services/FM/FMUserService.cs index f328e8b..892c39e 100644 --- a/APT.BaseData.Services/Services/FM/FMUserService.cs +++ b/APT.BaseData.Services/Services/FM/FMUserService.cs @@ -992,5 +992,34 @@ namespace APT.BaseData.Services.Services.FM } return GetEntities(expression).ToList(); } + + + #region 找安环部人员 + + /// + /// 找安环部人员 + /// + /// 1 NUM 从小到大 找第一个 10 NUM 找老大 + /// 1 + /// + public T_FM_USER GetSafeApproveUser(Guid ORG_ID, int UserType = 1) + { + T_FM_USER model = null; + Expression> expression = e => e.ENABLE_STATUS == 0 && !e.IS_DELETED && e.DEPARTMENT_ID.HasValue && e.Nav_Department.ENABLE_STATUS == 0 && e.APPROVE_ROLE_ID.HasValue && e.Nav_Department.DEPARTMENT_STATUS == (int)FMDepartmentStatus.安全部门; + BaseFilter fiter = new BaseFilter(ORG_ID); + fiter.Sort = "NUM"; + if (UserType == 10) + { + fiter.Order = DbOrder.ASC; //找老大 + } + else + { + fiter.Order = DbOrder.DESC; //找老小 + } + model = GetEntity(expression, fiter, null); + return model; + } + + #endregion } } diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs index ae5ce72..ff96f2b 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs @@ -1867,6 +1867,4 @@ namespace APT.BS.WebApi.Controllers.Api } #endregion } -} - - +} \ No newline at end of file diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SERenewalTrainController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SERenewalTrainController.cs index 2154418..335688a 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SERenewalTrainController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SERenewalTrainController.cs @@ -31,9 +31,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE public class SERenewalTrainController : AuthorizeApiController { IFMNotificationTaskService NotificationTaskService { get; set; } - public SERenewalTrainController(IFMNotificationTaskService notificationTaskService) + IFMUserService UserService { get; set; } + public SERenewalTrainController(IFMNotificationTaskService notificationTaskService, IFMUserService userService) { NotificationTaskService = notificationTaskService; + UserService = userService; } /// /// 更新 @@ -45,6 +47,14 @@ namespace APT.SC.WebApi.Controllers.Api.SE { return SafeExecute(() => { + if (entity.EXPIRY_START_DATE == DateTime.MinValue) + { + throw new Exception("请选择证书的有效期限!"); + } + if (entity.EXPIRY_DATE.Year <= 1990) + { + throw new Exception(" 请选择证书合适的有效期限!"); + } //人员 证书名称 复审日期 var modelCheck = GetEntity(e => e.USER_ID == entity.USER_ID && e.CERTIFICATE_NAME == entity.CERTIFICATE_NAME && e.REVIEW_DATE == entity.REVIEW_DATE && e.ID != entity.ID); if (modelCheck != null)