修改

IRaCIS.Core.Application/Service/Common/DTO/EmailLogViewModel.cs

@@ -10,6 +10,11 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.ViewModel;
 
+
+public class GetReSendEmailInDto : PageInput
+{
+    public Guid Id { get; set; }
+}
 public class EmailLogView : EmailLogAddOrEdit
 {
     

IRaCIS.Core.Application/Service/Common/EmailLogService.cs

@@ -38,6 +38,8 @@ public class EmailLogService(IRepository<EmailLog> _emailLogRepository,
     IRepository<Trial> _trialRepository,
       IRepository<EmailAttachmentLog> _emailAttachmentLogRepository,
     IOSSService oSSService,
+        IRepository<EmailReSendLog> _emailReSendLog,
+
     IRepository<EmailRecipientLog> _emailRecipientLogRepository,
        IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig,
                                   IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer): BaseService, IEmailLogService
@@ -75,6 +77,28 @@ public class EmailLogService(IRepository<EmailLog> _emailLogRepository,
 
     }
 
+    /// <summary>
+    /// 获取重发信息
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<PageOutput<EmailLogView>> GetReSendEmail(GetReSendEmailInDto inDto)
+    {
+        var messageId = await _emailLogRepository.Where(x => x.Id == inDto.Id).Select(x => x.MessageId).FirstOrDefaultAsync();
+
+        var reSendMessagelist = await _emailReSendLog.Where(x => x.MainMailMessageId == messageId).Select(x => x.ReMailMessageId).ToListAsync();
+        var emailLogQueryable = _emailLogRepository
+         
+        .Where(x => reSendMessagelist.Contains(x.MessageId))
+           .ProjectTo<EmailLogView>(_mapper.ConfigurationProvider);
+
+        var defalutSortArray = new string[] { nameof(EmailLogView.EmailDate) + " desc" };
+        var pageList = await emailLogQueryable.ToPagedListAsync(inDto, defalutSortArray);
+
+        return pageList;
+
+    }
     /// <summary>
     /// 获取单条邮件日志详情
     /// </summary>
@@ -222,7 +246,18 @@ public class EmailLogService(IRepository<EmailLog> _emailLogRepository,
 
         messageToSend.Body = builder.ToMessageBody();
 
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        var msgid= await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+
+
+        await _emailReSendLog.AddAsync(new EmailReSendLog()
+        {
+            MainMailMessageId= emailInfo.MessageId,
+            ReMailMessageId= msgid
+        });
+
+        await _emailReSendLog.SaveChangesAsync();
+
+        await SynchronizationEmail();
 
         return ResponseOutput.Ok();
     }