From 017babde86f7520f818f4d8327f44621a5c3258b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 27 Nov 2024 14:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Document/TrialEmailNoticeConfigService.cs | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index c5c0c92d2..2e2ed156e 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -1244,7 +1244,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
 
-            var emailNoticeConfigQueryable = _emailNoticeConfigRepository.Where(t=>t.BusinessLevelEnum==BusinessLevel.Trial)        
+            var emailNoticeConfigQueryable = _emailNoticeConfigRepository.Where(t => t.BusinessLevelEnum == BusinessLevel.Trial)
            .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
            .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
            .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
@@ -1348,6 +1348,19 @@ namespace IRaCIS.Core.Application.Service
 
             await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
+            //处理定时任务
+            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId== trialId && t.EmailCron != string.Empty && t.IsAutoSend)
+             .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+             .ToListAsync();
+
+            foreach (var task in taskInfoList)
+            {
+                //利用主键作为任务Id
+                var jobId = $"{task.TrialId}({task.TrialCode})_({task.BusinessScenarioEnum})";
+
+                HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron);
+            }
+
             return ResponseOutput.Ok();
 
 
@@ -1453,7 +1466,12 @@ namespace IRaCIS.Core.Application.Service
 
                 await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
-                var jobId = $"{addOrEditTrialEmailNoticeConfig.TrialId}_{id}";
+                var cronInfo = await _trialEmailNoticeConfigRepository.Where(t => t.Id == addOrEditTrialEmailNoticeConfig.Id)
+            .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+            .FirstAsync();
+
+                var jobId = $"{cronInfo.TrialId}({cronInfo.TrialCode})_({cronInfo.BusinessScenarioEnum})";
+
 
                 if (addOrEditTrialEmailNoticeConfig.IsAutoSend)
                 {