From 65e2a45d74c926d3bb2f18acb538e0b1c14ce412 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 15 Apr 2024 10:28:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 2 +-
.../Service/Management/DTO/UserLogViewModel.cs | 4 ++++
IRaCIS.Core.Application/Service/Management/UserService.cs | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 532cdd2da..93adc7873 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -12337,7 +12337,7 @@
-
+
配置流程验证
diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index c7d2b37ab..909f42ff8 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -51,6 +51,10 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime? EndDate { get; set; }
+ public string? LoginUserName { get; set; }
+
+ public UserTypeEnum? LoginUserTypeEnum { get; set; }
+
}
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 9c64aa81d..438b88d3e 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -709,6 +709,8 @@ namespace IRaCIS.Application.Services
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
.WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
.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.IP), t => t.IP.Contains(inQuery.IP!))
.ProjectTo(_mapper.ConfigurationProvider);
From c2aefebedc18f95e3ec6be6e5397aed455fe4161 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 15 Apr 2024 11:19:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
=?UTF-8?q?=E5=92=8C=E6=A0=87=E5=87=86=E7=A1=AE=E8=AE=A4=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DTO/TrialEmailNoticeConfigViewModel.cs | 3 +++
.../Document/TrialEmailNoticeConfigService.cs | 16 ++++++++++------
.../Triggers/TrialCriterionSignTrigger.cs | 4 ++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
index 652d381a6..76982a056 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
@@ -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; }
}
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 0e6b6667c..a8d0398d0 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -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(_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();
}
diff --git a/IRaCIS.Core.Application/Triggers/TrialCriterionSignTrigger.cs b/IRaCIS.Core.Application/Triggers/TrialCriterionSignTrigger.cs
index d0d21d603..ece0a42a3 100644
--- a/IRaCIS.Core.Application/Triggers/TrialCriterionSignTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/TrialCriterionSignTrigger.cs
@@ -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)
{