Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Helper/HangfireJobHelper.cs

@@ -91,6 +91,7 @@ namespace IRaCIS.Core.Application.Helper
                 case EmailBusinessScenario.GeneralTraining_ExpirationNotification:
 
                     HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new SystemDocumentErverDayEvent() { }, default), emailCron);
+                    HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new TrialDocumentErverDayEvent() { }, default), emailCron);
                     break;
 
                 default:

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -14462,6 +14462,17 @@
             如果为null或空，则发送给所有相关角色
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.TrialDocumentErverDayEvent">
+            <summary>
+            定时提醒
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.TrialDocumentPublishEvent.NewUserTypeIds">
+            <summary>
+            新增的需要发送邮件的用户角色ID列表
+            如果为null或空，则发送给所有相关角色
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.QCImageQuestionRecurringSchedule">
             <summary>
             QC 影像质疑待处理
@@ -14507,6 +14518,26 @@
             生效通知
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.MassTransit.Recurring.TrialDocumentErverDayEventConsumer">
+            <summary>
+            定时过期提醒
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.MassTransit.Recurring.TrialDocumentErverDayEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Contracts.ISystemDocumentService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocNeedConfirmedUserType},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+            <summary>
+            定时过期提醒
+            </summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.MassTransit.Recurring.TrialDocumentPublishEventConsumer">
+            <summary>
+            生效通知
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.MassTransit.Recurring.TrialDocumentPublishEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+            <summary>
+            生效通知
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.TaskAllocationRuleView">
             <summary> TaskAllocationRuleView  列表视图模型 </summary>
         </member>
@@ -16042,6 +16073,21 @@
         <member name="T:IRaCIS.Core.Application.Contracts.TrialDocumentAddOrEdit">
             <summary> TrialDocumentAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialDocumentAddOrEdit.CurrentStaffTrainDays">
+            <summary>
+            现有员工培训天数
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialDocumentAddOrEdit.NewStaffTrainDays">
+            <summary>
+            新员工培训天数
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialDocumentAddOrEdit.IsPublish">
+            <summary>
+            是否发布
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.ISystemDocumentService">
             <summary>
             ISystemDocumentService
@@ -17212,11 +17258,17 @@
             TrialDocumentService
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Contracts.ISystemDocumentService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Contracts.ISystemDocumentService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             TrialDocumentService
             </summary>	
         </member>
+        <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.PublishTrialDocument(IRaCIS.Core.Application.Contracts.PublishTrialDocumentInDto)">
+            <summary>
+            发布项目文档
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.GetTrialDocumentList(IRaCIS.Core.Application.Contracts.TrialDocumentQuery)">
             <summary>
             Setting 界面的  项目所有文档列表

IRaCIS.Core.Application/MassTransit/Recurring/Schedule/RecurringEvent.cs

@@ -58,3 +58,24 @@ public class SystemDocumentPublishEvent : DomainEvent
 }
 
 
+/// <summary>
+/// 定时提醒
+/// </summary>
+public class TrialDocumentErverDayEvent : DomainEvent
+{
+
+}
+
+
+public class TrialDocumentPublishEvent : DomainEvent
+{
+    public List<Guid> Ids { get; set; }
+
+    /// <summary>
+    /// 新增的需要发送邮件的用户角色ID列表
+    /// 如果为null或空，则发送给所有相关角色
+    /// </summary>
+    public List<Guid> NewUserTypeIds { get; set; }
+}
+
+

IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs

@@ -0,0 +1,292 @@
+using DocumentFormat.OpenXml;
+using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.MassTransit.Consumer;
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Models;
+using MassTransit;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using MimeKit;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reactive.Joins;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.MassTransit.Recurring
+{
+
+    /// <summary>
+    /// 定时过期提醒
+    /// </summary>
+    public class TrialDocumentErverDayEventConsumer(
+        IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
+        IRepository<VisitTask> _visitTaskRepository,
+           IRepository<SystemDocument> _systemDocumentRepository,
+             IRepository<IdentityUser> _identityUserRepository,
+                   IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository,
+         IRepository<Dictionary> _dictionaryRepository,
+        IRepository<TrialUserRole> _trialUserRoleRepository, IRepository<TrialDocument> _trialDocumentRepository,
+        IRepository<Trial> _trialRepository,
+        ISystemDocumentService _systemDocumentService,
+        IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository,
+         IRepository<TrialDocNeedConfirmedUserType> _trialDocNeedConfirmedUserTypeRepository,
+           IServiceScopeFactory serviceScopeFactory,
+        IRepository<TrialIdentityUser> _trialIdentityUserRepository,
+        IRepository<TrialDocConfirmedIdentityUser> _trialDocConfirmedUserRepository,
+        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+        IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+
+        IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<TrialDocumentErverDayEvent>
+    {
+        private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+        public async Task Consume(ConsumeContext<TrialDocumentErverDayEvent> context)
+        {
+
+            DateTime now = DateTime.Now;
+            Console.WriteLine("发送定时项目过期提醒");
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+            var trialDocQuery =
+             from trialDoc in _trialDocumentRepository.AsQueryable(true)
+             join trialUser in _trialIdentityUserRepository.AsQueryable() on trialDoc.TrialId equals trialUser.TrialId
+             join confirm in _trialDocConfirmedUserRepository.Where() on
+             new { trialUser.IdentityUserId, TrialDocumentId = trialDoc.Id } equals new { IdentityUserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+
+             from confirm in cc.DefaultIfEmpty()
+             select new TrialSignDocView()
+            {
+                TrialCode = trialDoc.Trial.TrialCode,
+                ResearchProgramNo = trialDoc.Trial.ResearchProgramNo,
+                ExperimentName = trialDoc.Trial.ExperimentName,
+                CurrentStaffTrainDays = trialDoc.CurrentStaffTrainDays,
+                NewStaffTrainDays = trialDoc.NewStaffTrainDays,
+                Id = trialDoc.Id,
+                IsSystemDoc = false,
+                CreateTime = trialDoc.CreateTime,
+                FullFilePath = trialDoc.Path,
+                IsDeleted = trialDoc.IsDeleted,
+                Name = trialDoc.Name,
+                Path = trialDoc.Path,
+                FileTypeId = trialDoc.FileTypeId,
+                UpdateTime = trialDoc.UpdateTime,
+                SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                //IsConfirmed = confirm.ConfirmTime != null,
+                ConfirmUserId = confirm.ConfirmUserId,
+                ConfirmTime = confirm.ConfirmTime,
+                RealName = trialUser.IdentityUser.FullName,
+                UserName = trialUser.IdentityUser.UserName,
+
+                IdentityUserTypeList = trialUser.TrialUserRoleList.Select(t => t.UserRole.UserTypeRole.UserTypeShortName).ToList(),
+
+                DocNeedSignUserTypeList = trialDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeShortName).ToList(),
+            };
+            var datalist = await trialDocQuery.IgnoreQueryFilters().Where(t => t.IsDeleted == false && t.ConfirmTime == null)
+             .ToListAsync();
+            datalist = datalist.Where(x => x.SuggestFinishTime != null && x.SuggestFinishTime.Value.Date == DateTime.Now.Date)
+                .Where(x => x.IsNeedSendEmial).ToList();
+            var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
+            var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
+
+            Console.WriteLine("发送定时项目过期提醒:人员数量" + userinfoList.Count);
+            int index = 1;
+            foreach (var userinfo in userinfoList)
+            {
+                try
+                {
+                    Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}");
+                    index++;
+                    var messageToSend = new MimeMessage();
+                    //发件地址
+                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                    messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+
+
+                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+                    {
+                        var topicStr = string.Format(input.topicStr, companyName);
+
+                        var htmlBodyStr = string.Format(
+                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                           userinfo.UserName,  // 用户名  {0}
+                                 _systemEmailConfig.SiteUrl
+                            );
+
+                        return (topicStr, htmlBodyStr);
+                    };
+
+                    var scenario = EmailBusinessScenario.GeneralTraining_ExpirationNotification;
+
+                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+                    if (emailConfig != null)
+                    {
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                    }
+
+
+                }
+                catch (Exception)
+                {
+
+                }
+
+            }
+
+
+        }
+    }
+
+    /// <summary>
+    /// 生效通知
+    /// </summary>
+    public class TrialDocumentPublishEventConsumer(
+     IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
+     IRepository<VisitTask> _visitTaskRepository,
+        IRepository<TrialDocument> _trialDocumentRepository,
+          IRepository<IdentityUser> _identityUserRepository,
+               
+      IRepository<Dictionary> _dictionaryRepository,
+     IRepository<TrialUserRole> _trialUserRoleRepository,
+     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+
+     IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<TrialDocumentPublishEvent>
+    {
+        private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+        public async Task Consume(ConsumeContext<TrialDocumentPublishEvent> context)
+        {
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+            // 记录是否只发送给新增角色的日志
+            if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
+            {
+                Console.WriteLine($"只发送给新增项目的角色，角色数量: {context.Message.NewUserTypeIds.Count}");
+            }
+            // 构建查询
+            IQueryable<UnionDocumentWithConfirmInfoView> systemDocQuery;
+
+            if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
+            {
+                // 只查询新增角色的用户
+                systemDocQuery =
+                from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
+                from identityUser in _identityUserRepository.AsQueryable(false)
+                .Where(t => t.Status == UserStateEnum.Enable &&
+                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
+                       .Any(t => context.Message.NewUserTypeIds.Contains(t.UserTypeId) &&
+                            trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+                select new UnionDocumentWithConfirmInfoView()
+                {
+                    IsSystemDoc = true,
+                    Id = trialDoc.Id,
+                    CreateTime = trialDoc.CreateTime,
+                    IsDeleted = trialDoc.IsDeleted,
+                    SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                    Name = trialDoc.Name,
+                    Path = trialDoc.Path,
+                    FileTypeId = trialDoc.FileTypeId,
+                    UpdateTime = trialDoc.UpdateTime,
+                    ConfirmUserId = identityUser.Id,
+                    RealName = identityUser.FullName,
+                    UserName = identityUser.UserName,
+                    IsNeedSendEmial = identityUser.IsZhiZhun,
+                    FullFilePath = trialDoc.Path
+                };
+            }
+            else
+            {
+                // 查询所有相关角色的用户
+                systemDocQuery =
+                from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
+                from identityUser in _identityUserRepository.AsQueryable(false)
+                .Where(t => t.Status == UserStateEnum.Enable &&
+                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
+                       .Any(t => trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+                select new UnionDocumentWithConfirmInfoView()
+                {
+                    IsSystemDoc = true,
+                    Id = trialDoc.Id,
+                    CreateTime = trialDoc.CreateTime,
+                    IsDeleted = trialDoc.IsDeleted,
+                    SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                    Name = trialDoc.Name,
+                    Path = trialDoc.Path,
+                    FileTypeId = trialDoc.FileTypeId,
+                    UpdateTime = trialDoc.UpdateTime,
+                    ConfirmUserId = identityUser.Id,
+                    RealName = identityUser.FullName,
+                    UserName = identityUser.UserName,
+                    IsNeedSendEmial = identityUser.IsZhiZhun ,
+                    FullFilePath = trialDoc.Path
+                };
+            }
+            var datalist = await systemDocQuery.IgnoreQueryFilters().ToListAsync();
+
+            var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
+            var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
+            int index = 1;
+            foreach (var userinfo in userinfoList)
+            {
+                string msg = $"{index}项目生效通知,邮箱：{userinfo.EMail}，姓名{userinfo.UserName},";
+                index++;
+                try
+                {
+
+                    var messageToSend = new MimeMessage();
+                    //发件地址
+                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                    messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+
+
+                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+                    {
+                        var topicStr = string.Format(input.topicStr, companyName);
+
+                        var htmlBodyStr = string.Format(
+                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                           userinfo.UserName,  // 用户名  {0}
+                           _systemEmailConfig.SiteUrl
+                            );
+
+                        return (topicStr, htmlBodyStr);
+                    };
+
+                    var scenario = EmailBusinessScenario.GeneralTraining_EffectiveNotification;
+
+                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+                    if (emailConfig != null)
+                    {
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        msg += "发送成功";
+                    }
+
+
+                }
+                catch (Exception)
+                {
+                    msg += "发送失败";
+
+                }
+
+
+                Console.WriteLine(msg);
+            }
+
+        }
+    }
+}

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -365,6 +365,11 @@ namespace IRaCIS.Core.Application.Contracts
         public List<Guid> Ids { get; set; }
     }
 
+    public class PublishTrialDocumentInDto
+    {
+        public List<Guid> Ids { get; set; }
+    }
+
     public class AddOrEditSystemDocument : SystemDocumentAddOrEdit
     {
 

IRaCIS.Core.Application/Service/Document/DTO/TrialDocumentViewModel.cs

@@ -60,6 +60,24 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int SignViewMinimumMinutes { get; set; }
 
+
+        /// <summary>
+        /// 现有员工培训天数
+        /// </summary>
+        public int? CurrentStaffTrainDays { get; set; }
+
+
+        /// <summary>
+        /// 新员工培训天数
+        /// </summary>
+        public int? NewStaffTrainDays { get; set; }
+
+        /// <summary>
+        /// 是否发布
+        /// </summary>
+
+        public bool IsPublish { get; set; } = true;
+
     }
 
     public class AddOrEditTrialDocument : TrialDocumentAddOrEdit

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -6,11 +6,14 @@
 
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
+using MassTransit.Mediator;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using NPOI.SS.Formula.Functions;
 using System.Linq;
 using System.Linq.Dynamic.Core;
@@ -28,6 +31,7 @@ namespace IRaCIS.Core.Application.Services
         IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository,
          IRepository<TrialDocNeedConfirmedUserType> _trialDocNeedConfirmedUserTypeRepository,
         IRepository<SystemDocument> _systemDocumentRepository,
+           IServiceScopeFactory serviceScopeFactory,
         IRepository<TrialIdentityUser> _trialIdentityUserRepository,
          IRepository<TrialUserRole> _trialUserRoleRepository,
           IRepository<IdentityUser> _identityUserRepository,
@@ -35,7 +39,34 @@ namespace IRaCIS.Core.Application.Services
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialDocumentService
     {
 
+        /// <summary>
+        /// 发布项目文档
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> PublishTrialDocument(PublishTrialDocumentInDto inDto)
+        {
+            await _trialDocumentRepository.BatchUpdateNoTrackingAsync(x => inDto.Ids.Contains(x.Id), x => new TrialDocument()
+            {
+                IsPublish = true,
+                IsDeleted = false,
+            });
+            Console.WriteLine("开始 发布项目文档");
 
+            Task.Run(async () =>
+            {
+                // 创建独立作用域
+                using (var scope = serviceScopeFactory.CreateScope())
+                {
+                    // 从新作用域解析服务
+                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+                    await mediator.Publish(new SystemDocumentPublishEvent { Ids = inDto.Ids });
+                }
+            });
+
+
+            return ResponseOutput.Result(true);
+        }
 
 
         /// <summary>
@@ -74,6 +105,8 @@ namespace IRaCIS.Core.Application.Services
                                         TrialCode = trialDoc.Trial.TrialCode,
                                         ResearchProgramNo = trialDoc.Trial.ResearchProgramNo,
                                         ExperimentName = trialDoc.Trial.ExperimentName,
+                                        CurrentStaffTrainDays = trialDoc.CurrentStaffTrainDays,
+                                        NewStaffTrainDays= trialDoc.NewStaffTrainDays,
                                         Id = trialDoc.Id,
                                         IsSystemDoc = false,
                                         CreateTime = trialDoc.CreateTime,
@@ -944,7 +977,9 @@ namespace IRaCIS.Core.Application.Services
 
                 var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
 
-
+                bool beforeIsPublish = document.IsPublish;
+                bool beforeIsDeleted = document.IsDeleted;
+                var beforeUserTypeIds = document.NeedConfirmedUserTypeList.Select(x => x.NeedConfirmUserTypeId).ToList();
 
                 _mapper.Map(addOrEditTrialDocument, document);
 
@@ -973,7 +1008,37 @@ namespace IRaCIS.Core.Application.Services
 
 
                 var success = await _trialDocumentRepository.SaveChangesAsync();
+                // 检查是否需要发送邮件给新增的角色
+                if (beforeIsPublish && document.IsPublish && !beforeIsDeleted && !document.IsDeleted)
+                {
+                    // 找出新增的用户角色ID
+                    var newUserTypeIds = addOrEditTrialDocument.NeedConfirmedUserTypeIdList
+                        .Where(id => !beforeUserTypeIds.Contains(id))
+                        .ToList();
 
+                    if (newUserTypeIds.Any() && newUserTypeIds.Count() > 0)
+                    {
+                        // 发送邮件给新增的角色
+                        Console.WriteLine("开始 发送项目文档更新邮件给新增角色");
+                        Console.WriteLine(string.Join(",", newUserTypeIds));
+
+                        Task.Run(async () =>
+                        {
+                            // 创建独立作用域
+                            using (var scope = serviceScopeFactory.CreateScope())
+                            {
+                                // 从新作用域解析服务
+                                var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+                                // 只发送给新增的角色
+                                await mediator.Publish(new TrialDocumentPublishEvent
+                                {
+                                    Ids = new List<Guid> { document.Id },
+                                    NewUserTypeIds = newUserTypeIds
+                                });
+                            }
+                        });
+                    }
+                }
                 return ResponseOutput.Ok(document.Id.ToString());
             }
         }

IRaCIS.Core.Domain/Document/TrialDocument.cs

@@ -28,5 +28,23 @@ public class TrialDocument : BaseFullDeleteAuditEntity
     public string Description { get; set; } = string.Empty;
 
     public int SignViewMinimumMinutes { get; set; }
+
+
+    /// <summary>
+    /// 现有员工培训天数
+    /// </summary>
+    public int? CurrentStaffTrainDays { get; set; }
+
+
+    /// <summary>
+    /// 新员工培训天数
+    /// </summary>
+    public int? NewStaffTrainDays { get; set; }
+
+    /// <summary>
+    /// 是否发布
+    /// </summary>
+
+    public bool IsPublish { get; set; } = true;
 }
 

IRaCIS.Core.Infra.EFCore/Migrations/20250529033652_CurrentStaffTrainDays.cs

@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class CurrentStaffTrainDays : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "CurrentStaffTrainDays",
+                table: "TrialDocument",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsPublish",
+                table: "TrialDocument",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<int>(
+                name: "NewStaffTrainDays",
+                table: "TrialDocument",
+                type: "int",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CurrentStaffTrainDays",
+                table: "TrialDocument");
+
+            migrationBuilder.DropColumn(
+                name: "IsPublish",
+                table: "TrialDocument");
+
+            migrationBuilder.DropColumn(
+                name: "NewStaffTrainDays",
+                table: "TrialDocument");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -11667,6 +11667,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("CreateUserId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<int?>("CurrentStaffTrainDays")
+                        .HasColumnType("int");
+
                     b.Property<Guid?>("DeleteUserId")
                         .HasColumnType("uniqueidentifier");
 
@@ -11685,11 +11688,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IsPublish")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
+                    b.Property<int?>("NewStaffTrainDays")
+                        .HasColumnType("int");
+
                     b.Property<string>("Path")
                         .IsRequired()
                         .HasMaxLength(400)