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

修改排序和标准确认生成任务

IRC_NewDev
hang 2024-04-15 11:19:31 +08:00
parent 1c5e4454da
commit c2aefebedc
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
View File

@ -108,6 +108,9 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsDistinguishCriteria { get; set; }
public string SortField { get; set; } = string.Empty;
public bool Asc { get; set; }
}

16
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

@ -26,6 +26,8 @@ using System;
using System.Runtime.InteropServices;
using SharpCompress.Common;
using SkiaSharp;
using DocumentFormat.OpenXml.Bibliography;
using System.Linq.Dynamic.Core;
namespace IRaCIS.Core.Application.Service
{
@ -316,13 +318,13 @@ namespace IRaCIS.Core.Application.Service
};
var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId,taskInfo.TrialReadingCriterionId);
var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId, taskInfo.TrialReadingCriterionId);
#endregion
//自动发送
if (sendEmailConfig != null && trialEmailConfig !=null)
if (sendEmailConfig != null && trialEmailConfig != null)
{
#region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
@ -679,8 +681,8 @@ namespace IRaCIS.Core.Application.Service
}
else
{
var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath)+".docx");
var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
{
wordMemoryStream.WriteTo(fileStream);
@ -718,7 +720,7 @@ namespace IRaCIS.Core.Application.Service
Document document = new Document();
document.LoadFromStream(wordMemoryStream, FileFormat.Docx);
document.SaveToStream(pdfMemoryStream, FileFormat.PDF);
}
else
{
@ -1355,7 +1357,9 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
.ProjectTo<TrialEmailNoticeConfigView>(_mapper.ConfigurationProvider);
return await trialEmailNoticeConfigQueryable.ToListAsync();
var sortField = string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TrialEmailNoticeConfigView.Code) : inQuery.SortField;
var orderQuery = inQuery.Asc ? trialEmailNoticeConfigQueryable.OrderBy(sortField) : trialEmailNoticeConfigQueryable.OrderBy(sortField + " desc");
return await orderQuery.ToListAsync();
}

4
IRaCIS.Core.Application/Triggers/TrialCriterionSignTrigger.cs
View File

@ -34,8 +34,8 @@ namespace IRaCIS.Core.Application.Triggers
if (context.ChangeType == ChangeType.Modified)
{
// 一致性核查通过 生成读片任务
if (context.UnmodifiedEntity?.ReadingInfoSignTime != trialCriterion.ReadingInfoSignTime && trialCriterion.ReadingInfoSignTime != null)
// 一致性核查通过 生成读片任务 同时要是自动生成的才会触发
if (context.UnmodifiedEntity?.ReadingInfoSignTime != trialCriterion.ReadingInfoSignTime && trialCriterion.ReadingInfoSignTime != null && trialCriterion.IsAutoCreate==true)
{