XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改表

Uat_Study
hang 2022-10-21 14:10:26 +08:00
parent 6892da7dd4
commit d126daff6c
4 changed files with 18 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -402,6 +402,17 @@
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.FillWordTemplateAndEmailConfig(System.Guid,System.Guid,System.Guid,IRaCIS.Core.Domain.Share.CommonDocumentBusinessScenario)">
<summary>
测试邮件 带附件 填充word --前端不需要用
</summary>
<param name="trialId"></param>
<param name="visitTaskId"></param>
<param name="trialReadingCriterionId"></param>
<param name="businessScenarioEnum"></param>
<returns></returns>
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
</member>
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.Preview(System.Guid)">
<summary> 指定资源Id，渲染Dicom检查的Jpeg预览图像 </summary>
<param name="studyId"> Dicom检查的Id </param>

2
IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
View File

@ -44,7 +44,7 @@ namespace IRaCIS.Core.Application.Contracts
///<summary> EmailNoticeConfigAddOrEdit 列表查询参数模型</summary>
public class EmailNoticeConfigAddOrEdit
{
public Guid Id { get; set; }
public Guid? Id { get; set; }
public string Code { get; set; } = String.Empty;

12
IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
View File

@ -16,18 +16,18 @@ namespace IRaCIS.Core.Application.Contracts
[ApiExplorerSettings(GroupName = "Common")]
public class EmailNoticeConfigService : BaseService, IEmailNoticeConfigService
{
private readonly IRepository<EmailNoticeConfig> repository;
private readonly IRepository<EmailNoticeConfig> _emailNoticeConfigrepository;
public EmailNoticeConfigService(IRepository<EmailNoticeConfig> repository)
{
this.repository = repository;
_emailNoticeConfigrepository = repository;
}
[HttpPost]
public async Task<PageOutput<EmailNoticeConfigView>> GetEmailNoticeConfigList(EmailNoticeConfigQuery queryEmailNoticeConfig)
{
var emailNoticeConfigQueryable = _repository
.WhereIf<EmailNoticeConfig>(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
var emailNoticeConfigQueryable = _emailNoticeConfigrepository
.WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
.WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired)
.WhereIf(queryEmailNoticeConfig.IsUrgent != null, t => t.IsUrgent == queryEmailNoticeConfig.IsUrgent)
.WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable)
@ -40,7 +40,7 @@ namespace IRaCIS.Core.Application.Contracts
public async Task<IResponseOutput> AddOrUpdateEmailNoticeConfig(EmailNoticeConfigAddOrEdit addOrEditEmailNoticeConfig)
{
var entity = await _repository.InsertOrUpdateAsync<EmailNoticeConfig, EmailNoticeConfigAddOrEdit>(addOrEditEmailNoticeConfig, true);
var entity = await _emailNoticeConfigrepository.InsertOrUpdateAsync(addOrEditEmailNoticeConfig, true);
return ResponseOutput.Ok(entity.Id.ToString());
@ -50,7 +50,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpDelete("{emailNoticeConfigId:guid}")]
public async Task<IResponseOutput> DeleteEmailNoticeConfig(Guid emailNoticeConfigId)
{
var success = await repository.BatchDeleteNoTrackingAsync(t => t.Id == emailNoticeConfigId);
var success = await _emailNoticeConfigrepository.BatchDeleteNoTrackingAsync(t => t.Id == emailNoticeConfigId);
return ResponseOutput.Result(success);
}

34
IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
View File

@ -56,7 +56,6 @@ namespace IRaCIS.Core.Domain.Models
public DateTime UpdateTime { get; set; }
public bool IsDeleted { get; set; }
[Required]
public DateTime? DeletedTime { get; set; }
@ -66,39 +65,6 @@ namespace IRaCIS.Core.Domain.Models
//public string CriteriaEnumStr { get; set; } = String.Empty;
//[NotMapped]
//public List<CriterionType> CriteriaEnumList => CriteriaEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries)
// .Select(t=> (CriterionType)Enum.ToObject(typeof(CriterionType), Convert.ToInt32(t) )).ToList();
[Required]
public Guid ScenarioId { get; set; }
[ForeignKey("ScenarioId")]
public SystemBasicData Scenario { get; set; }
[Required]
public string Title { get; set; } = String.Empty;
[Required]
public string Body { get; set; } = String.Empty;
[Required]
public string FromEmail { get; set; } = String.Empty;
public string AuthorizationCode { get; set; } = String.Empty;
[Required]
public string ReceiveEmail { get; set; } = String.Empty;
[Required]
public string CopyEmail { get; set; } = String.Empty;