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

Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
he
2023-11-28 16:46:31 +08:00
parent 73cbf96a65 bee4a4b22b
commit 0f5a1a6335
11 changed files with 124 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Helper/OSSService.cs
+16 -1
View File
@@ -113,6 +113,14 @@ namespace IRaCIS.Core.Application.Helper
}
/// <summary>
/// oosFolderPath 不要 "/ "开头 应该： TempFolder/ChildFolder
/// </summary>
/// <param name="fileStream"></param>
/// <param name="oosFolderPath"></param>
/// <param name="fileRealName"></param>
/// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception>
public string UploadToOSS(Stream fileStream, string oosFolderPath,string fileRealName)
{
@@ -133,7 +141,7 @@ namespace IRaCIS.Core.Application.Helper
}
return ossRelativePath;
return "/" + ossRelativePath;
}
catch (Exception ex)
{
@@ -142,6 +150,13 @@ namespace IRaCIS.Core.Application.Helper
}
}
/// <summary>
/// oosFolderPath 不要 "/ "开头 应该： TempFolder/ChildFolder
/// </summary>
/// <param name="localFilePath"></param>
/// <param name="oosFolderPath"></param>
/// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception>
public string UploadToOSS(string localFilePath, string oosFolderPath)
{
var localFileName = Path.GetFileName(localFilePath);
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+19
View File
@@ -85,6 +85,25 @@
<param name="type"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.IO.Stream,System.String,System.String)">
<summary>
oosFolderPath 不要 "/ "开头 应该： TempFolder/ChildFolder
</summary>
<param name="fileStream"></param>
<param name="oosFolderPath"></param>
<param name="fileRealName"></param>
<returns></returns>
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
</member>
<member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.String,System.String)">
<summary>
oosFolderPath 不要 "/ "开头 应该： TempFolder/ChildFolder
</summary>
<param name="localFilePath"></param>
<param name="oosFolderPath"></param>
<returns></returns>
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
</member>
<member name="T:IRaCIS.Core.Application.Service.TaskAllocationRuleService">
<summary>
分配规则
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
+1 -1
View File
@@ -165,7 +165,7 @@ namespace IRaCIS.Core.Application.Services
var trialId = querySystemDocument.TrialId;
var trialInfo = await (_repository.Where<Trial>(t => t.Id == querySystemDocument.TrialId).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstOrDefaultAsync());
var trialInfo = await (_repository.Where<Trial>(t => t.Id == querySystemDocument.TrialId,ignoreQueryFilters:true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstOrDefaultAsync());
//系统文档查询
var systemDocumentQueryable = from needConfirmedUserType in _repository.Where<SystemDocNeedConfirmedUserType>(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+1 -1
View File
@@ -323,7 +323,7 @@ namespace IRaCIS.Core.Application.Services
{
//CRC只看到他负责的
var list = await _trialSiteRepository.Where(t => t.TrialId == trialId)
var list = await _trialSiteRepository.Where(t => t.TrialId == trialId).IgnoreQueryFilters()
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.CRCUserList.Any(t => t.UserId == _userInfo.Id))
.ProjectTo<TrialSiteForSelect>(_mapper.ConfigurationProvider).OrderBy(t => t.TrialSiteCode).ToListAsync();