XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目邮件默认值
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-12-18 17:08:42 +08:00
parent 77b9b14cb6
commit 6ad80f540d
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -34,10 +34,11 @@ namespace IRaCIS.Core.Application.Service
IRepository<TrialDictionary> _trialDictionaryRepository, IRepository<TrialDictionary> _trialDictionaryRepository,
IRepository<TrialBodyPart> _trialBodyPartRepository, IRepository<TrialBodyPart> _trialBodyPartRepository,
IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig, IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig,
IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ITrialService IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ITrialService
{ {
private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
public bool TrialExpeditedChange { get; set; } = false; public bool TrialExpeditedChange { get; set; } = false;
@ -113,9 +114,9 @@ namespace IRaCIS.Core.Application.Service
List<int> pm = new List<int>() { (int)UserTypeEnum.ProjectManager }; List<int> pm = new List<int>() { (int)UserTypeEnum.ProjectManager };
// QA EA // QA EA
List<int> qAEq= new List<int>() { (int)UserTypeEnum.QA, (int)UserTypeEnum.EA }; List<int> qAEq = new List<int>() { (int)UserTypeEnum.QA, (int)UserTypeEnum.EA };
List<int> other = new List<int>() { }; List<int> other = new List<int>() { };
other.AddRange(sap); other.AddRange(sap);
other.AddRange(pm); other.AddRange(pm);
@ -125,24 +126,24 @@ namespace IRaCIS.Core.Application.Service
return await _trialRepository.AsQueryable() return await _trialRepository.AsQueryable()
//SuperAdmin Admin OP //SuperAdmin Admin OP
.WhereIf(sap.Contains(_userInfo.UserTypeEnumInt),x=> trialState.Contains(x.TrialStatusStr)) .WhereIf(sap.Contains(_userInfo.UserTypeEnumInt), x => trialState.Contains(x.TrialStatusStr))
// pm // pm
.WhereIf(pm.Contains(_userInfo.UserTypeEnumInt),t=> t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false .WhereIf(pm.Contains(_userInfo.UserTypeEnumInt), t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false
&& t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false)) && t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false))
&& t.IsDeleted == false) && t.IsDeleted == false)
// QA EA // QA EA
.WhereIf(qAEq.Contains(_userInfo.UserTypeEnumInt), t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false .WhereIf(qAEq.Contains(_userInfo.UserTypeEnumInt), t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false
&& t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false)) && t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false))
&& t.IsDeleted == false && trialState.Contains(t.TrialStatusStr)) && t.IsDeleted == false && trialState.Contains(t.TrialStatusStr))
// other // other
.WhereIf(!other.Contains(_userInfo.UserTypeEnumInt), t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false .WhereIf(!other.Contains(_userInfo.UserTypeEnumInt), t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false
&& t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false)) && t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false))
&& t.IsDeleted == false&& t.TrialStatusStr == StaticData.TrialState.TrialOngoing) && t.IsDeleted == false && t.TrialStatusStr == StaticData.TrialState.TrialOngoing)
.ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();
} }
@ -330,6 +331,14 @@ namespace IRaCIS.Core.Application.Service
trial.UpdateTime = DateTime.Now; trial.UpdateTime = DateTime.Now;
#region 邮件默认值
trial.EmailAuthorizationCode = _systemEmailConfig.AuthorizationCode;
trial.EmailFromEmail = _systemEmailConfig.FromEmail;
trial.EmailFromName = $"{_systemEmailConfig.FromName}-{trial.TrialCode}";
trial.EmailSMTPServerAddress = _systemEmailConfig.Host;
trial.EmailSMTPServerPort = _systemEmailConfig.Port;
#endregion
var success = await _trialRepository.SaveChangesAsync(); var success = await _trialRepository.SaveChangesAsync();
//维护CRO Sponsor //维护CRO Sponsor
@ -479,7 +488,7 @@ namespace IRaCIS.Core.Application.Service
public async Task DeleteOSSFolder() public async Task DeleteOSSFolder()
{ {
List<Guid> trialids = await _trialRepository.Select(x => x.Id).ToListAsync(); List<Guid> trialids = await _trialRepository.Select(x => x.Id).ToListAsync();
List<string> path= _oSSService.GetRootFolderNames(); List<string> path = _oSSService.GetRootFolderNames();
foreach (var item in path) foreach (var item in path)
{ {
if (Guid.TryParse(item, out Guid folderId) && !trialids.Contains(folderId)) if (Guid.TryParse(item, out Guid folderId) && !trialids.Contains(folderId))