From 661140ebf8fca2bec465beb0e5f3c26bbdf55780 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 28 Aug 2023 18:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E9=80=BB?=
=?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9--029=20=E9=A1=B9=E7=9B=AE=E9=82=AE?=
=?UTF-8?q?=E4=BB=B6=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E5=90=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/IRaCIS.Core.API.csproj | 4 ++++
.../Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs | 2 +-
.../Service/Document/TrialEmailNoticeConfigService.cs | 2 +-
IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs | 6 ++++--
IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj | 4 ++++
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
index 74b76b158..bd635aaea 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
@@ -79,6 +79,10 @@
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
index 7fcef3201..cc46adb34 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
@@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.ViewModel
public List CopyUserTypeList { get; set; }
-
+ public bool IsEnable { get; set; }
public bool IsAutoSend { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index cbf6299b7..cf403409a 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -1600,7 +1600,7 @@ namespace IRaCIS.Core.Application.Service
item.FromName=emailConfig.EmailFromName;
item.SMTPServerPort = emailConfig.EmailSMTPServerPort;
item.IsAutoSend = false;
-
+ item.IsEnable = false;
item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId;
diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
index 66e9f453b..d04a6137c 100644
--- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
@@ -95,9 +95,11 @@ namespace IRaCIS.Core.Domain.Models
public bool IsReturnRequired { get; set; }
[Required]
public bool IsAutoSend { get; set; }
-
- public EmailBusinessScenario BusinessScenarioEnum { get; set; }
+ public bool IsEnable { get; set; }
+
+
+ public EmailBusinessScenario BusinessScenarioEnum { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
diff --git a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
index 4baefc5d5..1521ce957 100644
--- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
+++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
@@ -22,6 +22,10 @@
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+