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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-06-06 09:28:23 +08:00
parent b97a8b5a68 91794266e7
commit 5a6411c6c3
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -7071,6 +7071,11 @@
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.TrialId">
<summary>
TrialId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.IsDepend">
<summary>
IsDepend

7
IRaCIS.Core.Application/Service/Institution/CROService.cs
View File

@ -35,7 +35,10 @@ namespace IRaCIS.Application.Services
/// <summary> 根据CRO 名称查询所有CRO 列表 </summary>
public async Task<IEnumerable<CroSelectDTO>> GetAllCROList(Guid? trialId)
{
return await _croRepository.Where(t => t.IsTrialLevel == false || t.TrialId == trialId).ProjectTo<CroSelectDTO>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
return await _croRepository
.WhereIf(trialId == null, t => t.IsTrialLevel == false)
.WhereIf(trialId != null, t => t.IsTrialLevel == false || t.TrialId == trialId)
.ProjectTo<CroSelectDTO>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
}
@ -47,7 +50,7 @@ namespace IRaCIS.Application.Services
var exp = new EntityVerifyExp<CRO>()
{
VerifyExp = cro =>( cro.CROName.Equals(addCroCompanyCommand.CROName) || cro.CRONameCN.Equals(addCroCompanyCommand.CRONameCN)) && cro.IsTrialLevel==false,
VerifyExp = cro => (cro.CROName.Equals(addCroCompanyCommand.CROName) || cro.CRONameCN.Equals(addCroCompanyCommand.CRONameCN)) && cro.IsTrialLevel == false,
//---已经存在同名的CRO，请确认。
VerifyMsg = _localizer["CRO_DupName"]
};

5
IRaCIS.Core.Application/Service/Institution/SponsorService.cs
View File

@ -37,7 +37,10 @@ namespace IRaCIS.Application.Services
public async Task<IEnumerable<SponsorSelectDTO>> GetAllSponsorList(Guid? trialId)
{
var sponsorQueryable = _sponsorRepository.Where(t => t.IsTrialLevel == false || t.TrialId == trialId).ProjectTo<SponsorSelectDTO>(_mapper.ConfigurationProvider,new { isEn_Us= _userInfo.IsEn_Us});
var sponsorQueryable = _sponsorRepository
.WhereIf(trialId == null, t => t.IsTrialLevel == false)
.WhereIf(trialId != null, t => t.IsTrialLevel == false || t.TrialId == trialId)
.ProjectTo<SponsorSelectDTO>(_mapper.ConfigurationProvider,new { isEn_Us= _userInfo.IsEn_Us});
return await sponsorQueryable.ToListAsync();
}

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

@ -304,9 +304,9 @@ namespace IRaCIS.Application.Services
if (trial.CROId != null)
{
if (await _repository.AnyAsync<Sponsor>(t => t.Id == trial.SponsorId && t.IsTrialLevel))
if (await _repository.AnyAsync<CRO>(t => t.Id == trial.CROId && t.IsTrialLevel))
{
await _repository.BatchUpdateAsync<Sponsor>(t => t.Id == trial.SponsorId, u => new Sponsor() { TrialId = trial.Id });
await _repository.BatchUpdateAsync<CRO>(t => t.Id == trial.CROId, u => new CRO() { TrialId = trial.Id });
}
}
}