修改提示

IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs

@@ -112,6 +112,30 @@ namespace IRaCIS.Core.Application.ViewModel
         public string FullFilePath { get; set; }
 
         public bool  IsRead { get; set; }
+
+
+        public Guid? PublishedUserId { get; set; }
+
+        public DateTime? PublishedTime { get; set; }
+
+        public string PublishUserName { get; set; }
+
+        public SystemNotice_NoticeStateEnum ActualNoticeStateEnum
+
+        {
+            get
+            {
+                if (NoticeStateEnum == SystemNotice_NoticeStateEnum.HavePublished && EndDate != null && EndDate < DateTime.Now)
+                {
+                    return SystemNotice_NoticeStateEnum.HaveExpired;
+                }
+                else
+                {
+                    return NoticeStateEnum;
+                }
+            }
+        }
+
     }
 
     public class SystemNoticeUserTypeView

IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs

@@ -111,7 +111,7 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Result(success);
         }
 
-        /// <summary>获取登陆用户的系统通知列表  只是过滤了用户类型 </summary>
+        /// <summary>获取登陆用户的系统通知列表  只是过滤了用户类型 和已经发布的</summary>
         [HttpPost]
         public async Task<PageOutput<SystemNoticeReadDTO>> GetUserSystemNoticeList(SystemNoticeQuery querySystemNotice)
         {

IRaCIS.Core.Application/Service/Management/_MapConfig.cs

@@ -78,14 +78,14 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.UserType, u => u.MapFrom(t => t.UserTypeName));
 
             CreateMap<User, UserDetailDTO>()
-           .ForMember(d => d.RealName, u => u.MapFrom(s => s.LastName + " / " + s.FirstName))
+           .ForMember(d => d.RealName, u => u.MapFrom(s => s.FullName))
            .ForMember(d => d.UserTypeId, u => u.MapFrom(s => s.UserTypeRole.Id))
            .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeName))
            .ForMember(d => d.UserTypeShortName, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName))
            .ForMember(d => d.CanEditUserType, u => u.MapFrom(s => !s.UserTrials.Any()));
 
             CreateMap<User, UserListDTO>()
-              .ForMember(d => d.RealName, u => u.MapFrom(s => s.LastName + " / " + s.FirstName))
+              .ForMember(d => d.RealName, u => u.MapFrom(s => s.FullName))
               .ForMember(d => d.UserTypeId, u => u.MapFrom(s => s.UserTypeRole.Id))
               .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName))
               .ForMember(d => d.CanEditUserType, u => u.MapFrom(s => !s.UserTrials.Any()));
@@ -93,15 +93,16 @@ namespace IRaCIS.Core.Application.Service
             var token = string.Empty;
             var userId = Guid.Empty;
             CreateMap<SystemNotice, SystemNoticeView>()
-               .ForMember(t => t.PublishUserName, d => d.MapFrom(t => t.PublishedUser.FullName))
-                .ForMember(t => t.CreateUserName, d => d.MapFrom(t => t.CreateUser.FullName))
+               .ForMember(t => t.PublishUserName, d => d.MapFrom(t => t.PublishedUser.UserName))
+                .ForMember(t => t.CreateUserName, d => d.MapFrom(t => t.CreateUser.UserName))
                 .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token));
 
 
 
 
             CreateMap<SystemNotice, SystemNoticeReadDTO>()
-                .ForMember(t => t.CreateUserName, d => d.MapFrom(t => t.CreateUser.FullName))
+                 .ForMember(t => t.PublishUserName, d => d.MapFrom(t => t.PublishedUser.UserName))
+                .ForMember(t => t.CreateUserName, d => d.MapFrom(t => t.CreateUser.UserName))
                 .ForMember(t => t.IsRead, d => d.MapFrom(t => t.NoticeUserReadList.Any(t => t.CreateUserId == userId)))
                 .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token));