diff --git a/IRaCIS.Core.API/Controllers/UploadController.cs b/IRaCIS.Core.API/Controllers/UploadController.cs
index a0a63bd1c..56acd7ed3 100644
--- a/IRaCIS.Core.API/Controllers/UploadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadController.cs
@@ -154,6 +154,46 @@ namespace IRaCIS.Core.API.Controllers
+ ///
+ /// 上传系统通知文档
+ ///
+ ///
+ [HttpPost("SystemNotice/UploadSystemNoticeDoc")]
+ [DisableRequestSizeLimit]
+ [DisableFormValueModelBinding]
+ public async Task UploadSystemNoticeDoc()
+ {
+ var boundary = HeaderUtilities.RemoveQuotes(MediaTypeHeaderValue.Parse(Request.ContentType).Boundary).Value;
+
+ var reader = new MultipartReader(boundary, HttpContext.Request.Body);
+
+ var section = await reader.ReadNextSectionAsync();
+
+ while (section != null)
+ {
+ var hasContentDispositionHeader = ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var contentDisposition);
+
+ if (hasContentDispositionHeader)
+ {
+
+ DealSystemNoticePath( contentDisposition.FileName.Value, out string serverFilePath, out string relativePath);
+
+ await WriteFileAsync(section.Body, serverFilePath);
+
+ //仅仅返回一个文件,如果多文件上传 在最后返回多个路径
+ return ResponseOutput.Ok(new
+ {
+ FilePath = relativePath,
+ FullFilePath = relativePath + "?access_token=" + _userInfo.UserToken
+ });
+
+ }
+ section = await reader.ReadNextSectionAsync();
+ }
+ return ResponseOutput.Ok();
+ }
+
+
private void DealCommonStorePath(string fileType, string moduleType, string fileRealName, out string serverFilePath, out string relativePath)
{
var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName;
@@ -174,6 +214,26 @@ namespace IRaCIS.Core.API.Controllers
}
+ private void DealSystemNoticePath(string fileRealName, out string serverFilePath, out string relativePath)
+ {
+ var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName;
+ //上传根路径
+ var _fileStorePath = Path.Combine(rootPath, StaticData.SystemNoticeFolder);
+
+ //文件类型路径处理
+ var uploadFolderPath = Path.Combine(_fileStorePath);
+ if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
+
+
+ var fileNameEX = Path.GetExtension(fileRealName);
+ var trustedFileNameForFileStorage = fileRealName+Guid.NewGuid().ToString() + fileNameEX;
+
+ relativePath = $"/{StaticData.CommonFileFolder}/{trustedFileNameForFileStorage}";
+
+ serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
+ }
+
+
private void DealSysTemStorePath( string type, string fileRealName, out string serverFilePath, out string relativePath)
{
var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName;
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 0608ee5b8..5b1e0283d 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -373,6 +373,12 @@
+
+
+ 上传系统通知文档
+
+
+
上传临床数据
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 7a2c53f77..91c9b1cd2 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -325,6 +325,11 @@
+
+
+ SystemNoticeService
+
+
项目外部人员 录入流程相关
@@ -515,15 +520,6 @@
SystemNoticeQuery 列表查询参数模型
-
- NoticeContent
-
-
- FileName
-
-
- Path
-
SystemNoticeAddOrEdit 列表查询参数模型
diff --git a/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs
index 5f1031888..562b62a9e 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs
@@ -6,60 +6,75 @@
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Domain.Share.Management;
+
namespace IRaCIS.Core.Application.ViewModel
{
/// SystemNoticeView 列表视图模型
- public class SystemNoticeView
+ public class SystemNoticeView : SystemNoticeBasicInfo
{
- public Guid Id { get; set; }
- public int NoticeLevelEnum { get; set; }
- public string NoticeContent { get; set; }
+
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public DateTime UpdateTime { get; set; }
public Guid UpdateUserId { get; set; }
- public int ApplicableProjectEnum { get; set; }
- public int NoticeMode { get; set; }
- public int NoticeStateEnum { get; set; }
- public DateTime? StartDate { get; set; }
- public DateTime? EndDate { get; set; }
- public string FileName { get; set; }
- public string Path { get; set; }
+
+ public string FullFilePath { get; set; }
+
+ public List NoticeUserTypeList { get; set; }
+
}
///SystemNoticeQuery 列表查询参数模型
- public class SystemNoticeQuery
+ public class SystemNoticeQuery:PageInput
{
- /// NoticeContent
- public string NoticeContent { get; set; }
+ public string NoticeContent { get; set; } = string.Empty;
- /// FileName
- public string FileName { get; set; }
+ public string FileName { get; set; } = string.Empty;
+
+ public SystemNotice_NoticeTypeEnum? NoticeTypeEnum { get; set; }
+
+ public SystemNotice_NoticeLevelEnum? NoticeLevelEnum { get; set; }
+
+ public SystemNotice_ApplicableProjectEnum? ApplicableProjectEnum { get; set; }
+
+ public SystemNotice_NoticeModeEnum? NoticeModeEnum { get; set; }
+
+ public SystemNotice_NoticeStateEnum? NoticeStateEnum { get; set; }
- /// Path
- public string Path { get; set; }
}
- /// SystemNoticeAddOrEdit 列表查询参数模型
- public class SystemNoticeAddOrEdit
+ public class SystemNoticeBasicInfo
{
- public Guid Id { get; set; }
- public int NoticeLevelEnum { get; set; }
+ public Guid? Id { get; set; }
public string NoticeContent { get; set; }
- public DateTime CreateTime { get; set; }
- public Guid CreateUserId { get; set; }
- public DateTime UpdateTime { get; set; }
- public Guid UpdateUserId { get; set; }
- public int ApplicableProjectEnum { get; set; }
- public int NoticeMode { get; set; }
- public int NoticeStateEnum { get; set; }
+
+ public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
+
+ public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
+
+ public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
+
+ public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
+
+ public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
+
public DateTime? StartDate { get; set; }
public DateTime? EndDate { get; set; }
public string FileName { get; set; }
public string Path { get; set; }
}
+ /// SystemNoticeAddOrEdit 列表查询参数模型
+ public class SystemNoticeAddOrEdit: SystemNoticeBasicInfo
+ {
+
+
+ public Guid[] NoticeUserTypeIdList { get; set; }
+ }
+
public class SystemNoticeUserTypeView
{
public Guid Id { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs
index 9fd1265d8..ef13f0288 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs
@@ -80,6 +80,15 @@ namespace IRaCIS.Core.Application.Contracts
}
+ public class UserTypeSimpleDTO
+ {
+ public Guid Id { get; set; }
+ public string UserTypeName { get; set; } = string.Empty;
+ public UserTypeEnum UserTypeEnum { get; set; }
+ public string UserTypeShortName { get; set; } = string.Empty;
+ public string PermissionStr { get; set; } = String.Empty;
+ }
+
}
diff --git a/IRaCIS.Core.Application/Service/Management/Interface/ISystemNoticeService.cs b/IRaCIS.Core.Application/Service/Management/Interface/ISystemNoticeService.cs
index 6b7b701fe..5f7610ddb 100644
--- a/IRaCIS.Core.Application/Service/Management/Interface/ISystemNoticeService.cs
+++ b/IRaCIS.Core.Application/Service/Management/Interface/ISystemNoticeService.cs
@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Application.Interfaces
{
- Task> GetSystemNoticeList(SystemNoticeQuery querySystemNotice);
+ Task> GetSystemNoticeList(SystemNoticeQuery querySystemNotice);
Task AddOrUpdateSystemNotice(SystemNoticeAddOrEdit addOrEditSystemNotice);
diff --git a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
index 54735d18a..e41dc225f 100644
--- a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
+++ b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
@@ -1,64 +1,82 @@
-////--------------------------------------------------------------------
-//// 此代码由T4模板自动生成 byzhouhang 20210918
-//// 生成时间 2022-04-25 09:46:43
-//// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
-////--------------------------------------------------------------------
+//--------------------------------------------------------------------
+// 此代码由T4模板自动生成 byzhouhang 20210918
+// 生成时间 2022-04-25 09:46:43
+// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
+//--------------------------------------------------------------------
-//using IRaCIS.Core.Domain.Models;
-//using Microsoft.AspNetCore.Mvc;
-//using IRaCIS.Core.Application.Interfaces;
-//using IRaCIS.Core.Application.ViewModel;
-//namespace IRaCIS.Core.Application.Service
-//{
-// ///
-// /// SystemNoticeService
-// ///
-// [ ApiExplorerSettings(GroupName = "Test")]
-// public class SystemNoticeService: BaseService, ISystemNoticeService
-// {
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
+namespace IRaCIS.Core.Application.Service
+{
+ ///
+ /// SystemNoticeService
+ ///
+ [ApiExplorerSettings(GroupName = "Management")]
+ public class SystemNoticeService : BaseService, ISystemNoticeService
+ {
-// private readonly IRepository _systemNoticeRepository;
+ private readonly IRepository _systemNoticeRepository;
-// public SystemNoticeService(IRepository systemNoticeRepository)
-// {
-// _systemNoticeRepository = systemNoticeRepository;
-// }
+ public SystemNoticeService(IRepository systemNoticeRepository)
+ {
+ _systemNoticeRepository = systemNoticeRepository;
+ }
-
-// public async Task> GetSystemNoticeList(SystemNoticeQuery querySystemNotice)
-// {
-
-
-// var systemNoticeQueryable = _repository.GetQueryable()
-// .ProjectTo(_mapper.ConfigurationProvider);
-
-// return await systemNoticeQueryable.ToListAsync();
-// }
-
-
-// public async Task AddOrUpdateSystemNotice(SystemNoticeAddOrEdit addOrEditSystemNotice)
-// {
-// // 在此处拷贝automapper 映射
-
-
-// //CreateMap();
-// // CreateMap< SystemNotice,SystemNoticeAddOrEdit>().ReverseMap();
+ [HttpPost]
+ public async Task> GetSystemNoticeList(SystemNoticeQuery querySystemNotice)
+ {
-// var entity = await _repository.InsertOrUpdateAsync(addOrEditSystemNotice, true);
+ var systemNoticeQueryable = _systemNoticeRepository
+ .WhereIf(querySystemNotice.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == querySystemNotice.ApplicableProjectEnum)
+ .WhereIf(querySystemNotice.NoticeLevelEnum != null, t => t.NoticeLevelEnum == querySystemNotice.NoticeLevelEnum)
+ .WhereIf(querySystemNotice.NoticeModeEnum != null, t => t.NoticeModeEnum == querySystemNotice.NoticeModeEnum)
+ .WhereIf(querySystemNotice.NoticeStateEnum != null, t => t.NoticeStateEnum == querySystemNotice.NoticeStateEnum)
+ .WhereIf(querySystemNotice.NoticeTypeEnum != null, t => t.NoticeTypeEnum == querySystemNotice.NoticeTypeEnum)
+ .WhereIf(!string.IsNullOrWhiteSpace(querySystemNotice.FileName), t => t.FileName.Contains(querySystemNotice.FileName))
+ .WhereIf(!string.IsNullOrWhiteSpace(querySystemNotice.NoticeContent), t => t.NoticeContent.Contains(querySystemNotice.NoticeContent))
+ .ProjectTo(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken});
-// return ResponseOutput.Ok(entity.Id.ToString());
-
-// }
+ return await systemNoticeQueryable.ToPagedListAsync(querySystemNotice.PageIndex, querySystemNotice.PageSize, querySystemNotice.SortField, querySystemNotice.Asc);
+ }
-// [HttpDelete("{systemNoticeId:guid}")]
-// public async Task DeleteSystemNotice(Guid systemNoticeId)
-// {
-// var success = await _repository.BatchDeleteAsync()(t => t.Id == systemNoticeId);
-// return ResponseOutput.Result(success);
-// }
+ public async Task AddOrUpdateSystemNotice(SystemNoticeAddOrEdit addOrEditSystemNotice)
+ {
-
-// }
-//}
+ if (addOrEditSystemNotice.Id == null)
+ {
+ var entity = await _systemNoticeRepository.InsertFromDTOAsync(addOrEditSystemNotice,true);
+
+ return ResponseOutput.Ok(entity.Id.ToString());
+
+ }
+ else
+ {
+ var systemNotice = await _systemNoticeRepository.Where(t => t.Id == addOrEditSystemNotice.Id, true, true).Include(t => t.NoticeUserTypeList).FirstOrDefaultAsync();
+
+
+ _mapper.Map(addOrEditSystemNotice, systemNotice);
+
+ await _systemNoticeRepository.SaveChangesAsync();
+
+ return ResponseOutput.Ok();
+
+ }
+
+
+ }
+
+
+ [HttpDelete("{systemNoticeId:guid}")]
+ public async Task DeleteSystemNotice(Guid systemNoticeId)
+ {
+ var success = await _systemNoticeRepository.BatchDeleteAsync(t => t.Id == systemNoticeId);
+ return ResponseOutput.Result(success);
+ }
+
+
+ }
+}
diff --git a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
index 9013975c1..e7ca22b54 100644
--- a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
@@ -2,6 +2,7 @@
using AutoMapper.EquivalencyExpression;
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Models;
namespace IRaCIS.Core.Application.Service
@@ -89,6 +90,23 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName))
.ForMember(d => d.CanEditUserType, u => u.MapFrom(s => !s.UserTrials.Any()));
+ var token = string.Empty;
+ CreateMap()
+ .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token)); ;
+
+ CreateMap().ReverseMap()
+ .ForMember(t=>t.NoticeUserTypeList,u=>u.MapFrom(t=>t.NoticeUserTypeIdList));
+
+
+ CreateMap().IncludeMembers(t=>t.NoticeUserType);
+
+ CreateMap();
+
+ CreateMap().EqualityComparison((odto, o) => odto == o.UserTypeId)
+ .ForMember(d => d.UserTypeId, c => c.MapFrom(t => t));
+
+
+
}
}
diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
index 98a2d5e6f..f28348a80 100644
--- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
@@ -25,7 +25,6 @@ namespace IRaCIS.Core.Application.Contracts
{
private readonly IRepository _noneDicomStudyRepository;
private readonly IHttpContextAccessor _httpContext;
- private readonly IWebHostEnvironment _hostEnvironment;
private readonly IDictionaryService _dictionaryService;
private readonly IInspectionService _inspectionService;
private readonly IRepository _noneDicomStudyFileRepository;
@@ -36,7 +35,6 @@ namespace IRaCIS.Core.Application.Contracts
public NoneDicomStudyService(IRepository noneDicomStudyRepository,
IHttpContextAccessor httpContext,
- IWebHostEnvironment hostEnvironment,
IDictionaryService dictionaryService,
IInspectionService inspectionService,
IRepository noneDicomStudyFileRepository)
@@ -44,7 +42,6 @@ namespace IRaCIS.Core.Application.Contracts
_noneDicomStudyRepository = noneDicomStudyRepository;
this._httpContext = httpContext;
- this._hostEnvironment = hostEnvironment;
this._dictionaryService = dictionaryService;
this._inspectionService = inspectionService;
_noneDicomStudyFileRepository = noneDicomStudyFileRepository;
diff --git a/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj b/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj
index f4492c127..78fa3b6cf 100644
--- a/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj
+++ b/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj
@@ -15,8 +15,4 @@
-
-
-
-
diff --git a/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs
new file mode 100644
index 000000000..c52a9c2ef
--- /dev/null
+++ b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs
@@ -0,0 +1,46 @@
+namespace IRaCIS.Core.Domain.Share.Management
+{
+ public enum SystemNotice_NoticeModeEnum
+ {
+ //跑马灯
+ RunningLight = 0,
+
+ //页面
+ Pages = 1
+ }
+
+ public enum SystemNotice_NoticeStateEnum
+ {
+ NotPublish = 0,
+
+ HavePublished = 1,
+
+ HaveExpired = 2
+
+ }
+
+
+ public enum SystemNotice_NoticeLevelEnum
+ {
+ SystemLevel=0,
+
+ TrialLevel=1
+ }
+
+ public enum SystemNotice_NoticeTypeEnum
+ {
+ SystemUpgrade = 0,
+
+ TrialChanges = 1
+ }
+
+
+ public enum SystemNotice_ApplicableProjectEnum
+ {
+ //非正式项目
+ OfficialTrial = 0,
+
+ NoneOfficial = 1
+ }
+
+}
\ No newline at end of file
diff --git a/IRaCIS.Core.Domain.Share/_StaticData.cs b/IRaCIS.Core.Domain.Share/_StaticData.cs
index 75c6b0581..4b1400cb1 100644
--- a/IRaCIS.Core.Domain.Share/_StaticData.cs
+++ b/IRaCIS.Core.Domain.Share/_StaticData.cs
@@ -28,6 +28,7 @@
public static readonly string UploadFileFolder = "UploadFile";
public static readonly string TreatmenthistoryFolder = "Treatmenthistory";
public static readonly string CommonFileFolder = "CommonFileFolder";
+ public static readonly string SystemNoticeFolder = "SystemNoticeFolder";
diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs
index e7285e240..b5eeaa547 100644
--- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs
+++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs
@@ -4,94 +4,85 @@
// 生成时间 2022-04-25 09:46:09
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
+using System.Collections.Generic;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+using IRaCIS.Core.Domain.Share.Management;
+
namespace IRaCIS.Core.Domain.Models
{
- ///
- ///SystemNotice
- ///
- [Table("SystemNotice")]
- public class SystemNotice : Entity, IAuditUpdate, IAuditAdd
- {
-
- ///
- /// NoticeLevelEnum
- ///
- [Required]
- public int NoticeLevelEnum { get; set; }
-
- ///
+ ///
+ ///SystemNotice
+ ///
+ [Table("SystemNotice")]
+ public class SystemNotice : Entity, IAuditUpdate, IAuditAdd
+ {
+
+ public List NoticeUserTypeList { get; set; }
+
+ public List NoticeUserReadList { get; set; }
+
+
+ ///
/// NoticeContent
///
- [Required]
- public string NoticeContent { get; set; }
-
- ///
+ [Required]
+ public string NoticeContent { get; set; }
+
+ ///
/// CreateTime
///
- [Required]
- public DateTime CreateTime { get; set; }
-
- ///
+ [Required]
+ public DateTime CreateTime { get; set; }
+
+ ///
/// CreateUserId
///
- [Required]
- public Guid CreateUserId { get; set; }
-
- ///
+ [Required]
+ public Guid CreateUserId { get; set; }
+
+ ///
/// UpdateTime
///
- [Required]
- public DateTime UpdateTime { get; set; }
-
- ///
+ [Required]
+ public DateTime UpdateTime { get; set; }
+
+ ///
/// UpdateUserId
///
- [Required]
- public Guid UpdateUserId { get; set; }
-
- ///
- /// ApplicableProjectEnum
- ///
- [Required]
- public int ApplicableProjectEnum { get; set; }
-
- ///
- /// NoticeMode
- ///
- [Required]
- public int NoticeMode { get; set; }
-
- ///
- /// NoticeStateEnum
- ///
- [Required]
- public int NoticeStateEnum { get; set; }
-
- ///
- /// StartDate
- ///
- public DateTime? StartDate { get; set; }
-
- ///
- /// EndDate
- ///
- public DateTime? EndDate { get; set; }
-
- ///
+ [Required]
+ public Guid UpdateUserId { get; set; }
+
+
+
+ public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
+
+ public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
+
+ public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
+
+ public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
+
+ public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
+
+
+ public DateTime? StartDate { get; set; }
+
+ public DateTime? EndDate { get; set; }
+
+ ///
/// FileName
///
- [Required]
- public string FileName { get; set; }
-
- ///
+ [Required]
+ public string FileName { get; set; }
+
+ ///
/// Path
///
- [Required]
- public string Path { get; set; }
-
- }
+ [Required]
+ public string Path { get; set; }
-}
+ }
+
+}
diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs
index 14fc0a0c0..db9561fa1 100644
--- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs
+++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs
@@ -41,6 +41,10 @@ namespace IRaCIS.Core.Domain.Models
///
[Required]
public Guid UserTypeId { get; set; }
+
+
+ [ForeignKey("UserTypeId")]
+ public UserType NoticeUserType { get; set; }
}
diff --git a/IRaCIS.Core.Infra.EFCore/Context/Triggers/AuditUpdateTrigger.cs b/IRaCIS.Core.Infra.EFCore/Context/Triggers/AuditUpdateTrigger.cs
index b6463e5c1..4a57c64f5 100644
--- a/IRaCIS.Core.Infra.EFCore/Context/Triggers/AuditUpdateTrigger.cs
+++ b/IRaCIS.Core.Infra.EFCore/Context/Triggers/AuditUpdateTrigger.cs
@@ -24,8 +24,6 @@ namespace IRaCIS.Core.Application.Triggers
context.Entity.UpdateTime=DateTime.UtcNow.AddHours(8);
}
-
-
return Task.CompletedTask;
}