diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs index 2766c0de5..17f65dbc4 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs @@ -21,7 +21,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring { /// - /// 定时提醒 + /// 定时过期提醒 /// public class SystemDocumentErverDayEventConsumer( IRepository _trialReadingCriterionRepository, @@ -41,8 +41,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring { DateTime now = DateTime.Now; - if (now.Hour == 9) - { + var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US; var systemDocQuery = from sysDoc in _systemDocumentRepository.AsQueryable(false) @@ -67,11 +66,11 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring UserName = identityUser.UserName, - + IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter), FullFilePath = sysDoc.Path }; var datalist = await systemDocQuery.IgnoreQueryFilters().Where(t => !(t.IsDeleted == true && t.ConfirmTime == null)) - .Where(x => x.ConfirmTime != null).ToListAsync(); + .Where(x => x.IsNeedSendEmial).Where(x => x.ConfirmTime != null).ToListAsync(); datalist = datalist.Where(x => x.SuggestFinishTime != null && x.SuggestFinishTime.Value.Date == DateTime.Now.Date).ToList(); var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList(); var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync(); @@ -106,7 +105,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig); } - } + } }