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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC_NewDev
he 2024-04-15 15:14:29 +08:00
parent 0165688799 c2aefebedc
commit aa85562076
5 changed files with 21 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 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 System.Runtime.InteropServices;
using SharpCompress.Common; using SharpCompress.Common;
using SkiaSharp; using SkiaSharp;
using DocumentFormat.OpenXml.Bibliography;
using System.Linq.Dynamic.Core;
namespace IRaCIS.Core.Application.Service 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 #endregion
//自动发送 //自动发送
if (sendEmailConfig != null && trialEmailConfig !=null) if (sendEmailConfig != null && trialEmailConfig != null)
{ {
#region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑 #region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
@ -679,8 +681,8 @@ namespace IRaCIS.Core.Application.Service
} }
else 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)) using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
{ {
wordMemoryStream.WriteTo(fileStream); wordMemoryStream.WriteTo(fileStream);
@ -718,7 +720,7 @@ namespace IRaCIS.Core.Application.Service
Document document = new Document(); Document document = new Document();
document.LoadFromStream(wordMemoryStream, FileFormat.Docx); document.LoadFromStream(wordMemoryStream, FileFormat.Docx);
document.SaveToStream(pdfMemoryStream, FileFormat.PDF); document.SaveToStream(pdfMemoryStream, FileFormat.PDF);
} }
else else
{ {
@ -1355,7 +1357,9 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum) .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
.ProjectTo<TrialEmailNoticeConfigView>(_mapper.ConfigurationProvider); .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/Service/Management/DTO/UserLogViewModel.cs
View File

@ -51,6 +51,10 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime? EndDate { get; set; } public DateTime? EndDate { get; set; }
public string? LoginUserName { get; set; }
public UserTypeEnum? LoginUserTypeEnum { get; set; }
} }

2
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -709,6 +709,8 @@ namespace IRaCIS.Application.Services
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType) .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
.WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate) .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
.WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate) .WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
.WhereIf(inQuery.LoginUserTypeEnum != null, t => t.LoginUser.UserTypeEnum== inQuery.LoginUserTypeEnum)
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.LoginUser.UserName.Contains(inQuery.LoginUserName!))
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.LoginFaildName.Contains(inQuery.LoginFaildName!)) .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.LoginFaildName.Contains(inQuery.LoginFaildName!))
.WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!)) .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
.ProjectTo<UserLogView>(_mapper.ConfigurationProvider); .ProjectTo<UserLogView>(_mapper.ConfigurationProvider);

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.ChangeType == ChangeType.Modified)
{ {
// 一致性核查通过 生成读片任务 // 一致性核查通过 生成读片任务 同时要是自动生成的才会触发
if (context.UnmodifiedEntity?.ReadingInfoSignTime != trialCriterion.ReadingInfoSignTime && trialCriterion.ReadingInfoSignTime != null) if (context.UnmodifiedEntity?.ReadingInfoSignTime != trialCriterion.ReadingInfoSignTime && trialCriterion.ReadingInfoSignTime != null && trialCriterion.IsAutoCreate==true)
{ {