Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

APT.BaseData.Domain/IServices/FM/IFMUserService.cs

@@ -103,5 +103,13 @@ namespace APT.BaseData.Domain.IServices.FM
         /// <param name="IsOnly">只返回一个人</param>
         /// <returns></returns>
         List<T_FM_USER> GetDepPostUser(ref string Msg, Guid DEPARTMENT_ID, Guid POST_ID, bool IsOnly);
+
+        /// <summary>
+        /// 找安环部人员
+        /// </summary>
+        /// <param name="UserType">1 NUM 从小到大 找第一个  2 NUM 找老大</param>
+        /// <param name="ORG_ID">1</param>
+        /// <returns></returns>
+        T_FM_USER GetSafeApproveUser(Guid ORG_ID, int UserType = 1);
     }
 }

APT.BaseData.Services/Services/FM/FMUserService.cs

@@ -992,5 +992,34 @@ namespace APT.BaseData.Services.Services.FM
             }
             return GetEntities(expression).ToList();
         }
+
+
+        #region    找安环部人员
+
+        /// <summary>
+        /// 找安环部人员
+        /// </summary>
+        /// <param name="UserType">1 NUM 从小到大 找第一个  10 NUM 找老大</param>
+        /// <param name="ORG_ID">1</param>
+        /// <returns></returns>
+        public T_FM_USER GetSafeApproveUser(Guid ORG_ID, int UserType = 1)
+        {
+            T_FM_USER model = null;
+            Expression<Func<T_FM_USER, bool>> 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<T_FM_USER>(expression, fiter, null);
+            return model;
+        }
+
+        #endregion
     }
 }

APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs

@@ -1867,6 +1867,4 @@ namespace APT.BS.WebApi.Controllers.Api
         }
         #endregion
     }
-}
+}
-
-

APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs

@@ -73,8 +73,10 @@ namespace APT.FO.WebApi.Controllers
             {
                 var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
                 var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
-                entity.APPLY_USER_ID = loginUserId;
+                if(entity.APPLY_USER_ID == null)
-                entity.APPLY_DEPARTMENT_ID = departmentId;
+                    entity.APPLY_USER_ID = loginUserId;
+                if(entity.APPLY_DEPARTMENT_ID == null)
+                    entity.APPLY_DEPARTMENT_ID = departmentId;
                 if (entity.COMPANY_ID == null)
                 {
                     entity.COMPANY_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null)?.ID;
@@ -285,6 +287,7 @@ namespace APT.FO.WebApi.Controllers
                         monitorFileList.Add(item);
                     }
                 }
+                T_FM_NOTIFICATION_TASK task = null;
                 List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
                 if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
                 {
@@ -421,12 +424,12 @@ namespace APT.FO.WebApi.Controllers
                         }, null, null, null, null, null, "FO043_SHOWPRINT", null,null, FMTASKTYPE.JobSite);
                         return true;
                     }
-                }
+                  
-                T_FM_NOTIFICATION_TASK task = null;
+                    if (entity.TaskID != Guid.Empty)
-                if (entity.TaskID != Guid.Empty)
+                    {
-                {
+                        task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
-                    task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
+                        task.SOURCE_FORMCODE = "FO043_SHOWPRINT";
-                    task.SOURCE_FORMCODE = "FO043_SHOWPRINT";
+                    }
                 }
                 this.UnifiedCommit(() =>
                 {

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<T_SE_RENEWAL_TRAIN>
     {
         IFMNotificationTaskService NotificationTaskService { get; set; }
-        public SERenewalTrainController(IFMNotificationTaskService notificationTaskService)
+        IFMUserService UserService { get; set; }
+        public SERenewalTrainController(IFMNotificationTaskService notificationTaskService, IFMUserService userService)
         {
             NotificationTaskService = notificationTaskService;
+            UserService = userService;
         }
         /// <summary>
         /// 更新
@@ -45,6 +47,14 @@ namespace APT.SC.WebApi.Controllers.Api.SE
         {
             return SafeExecute<bool>(() =>
             {
+                if (entity.EXPIRY_START_DATE == DateTime.MinValue)
+                {
+                    throw new Exception("请选择证书的有效期限！");
+                }
+                if (entity.EXPIRY_DATE.Year <= 1990)
+                {
+                    throw new Exception(" 请选择证书合适的有效期限！");
+                }
                 //人员 证书名称 复审日期
                 var modelCheck = GetEntity<T_SE_RENEWAL_TRAIN>(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)