@@ -341,7 +341,7 @@ namespace IRaCIS.Core.Application
|
||||
foreach (var item in systemCriterionKeyFile)
|
||||
{
|
||||
|
||||
var path = await _oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/ReadingModule/{trialCriterion.CriterionName}", true, true, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialCriterion.TrialId ,BatchDataType=BatchDataType.ReadingKeyFile });
|
||||
var path = await _oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/ReadingModule/{trialCriterion.CriterionName}", true, true, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialCriterion.TrialId, BatchDataType = BatchDataType.ReadingKeyFile });
|
||||
|
||||
trialCriterionKeyFiles.Add(new TrialCriterionKeyFile
|
||||
{
|
||||
@@ -611,8 +611,8 @@ namespace IRaCIS.Core.Application
|
||||
toolList = toolList.Distinct().ToList();
|
||||
|
||||
|
||||
var alltool= trialCriterion.ReadingToolList.Union(trialCriterion.SegmentToolList).ToList();
|
||||
|
||||
var alltool = trialCriterion.ReadingToolList.Union(trialCriterion.SegmentToolList).ToList();
|
||||
|
||||
|
||||
if (tabletoolList.Except(alltool).Count() > 0)
|
||||
{
|
||||
@@ -633,7 +633,7 @@ namespace IRaCIS.Core.Application
|
||||
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
|
||||
{
|
||||
ReadingToolList = inDto.ReadingToolList,
|
||||
SegmentToolList= inDto.SegmentToolList,
|
||||
SegmentToolList = inDto.SegmentToolList,
|
||||
IsImageFilter = inDto.IsImageFilter,
|
||||
ImageDownloadEnum = inDto.ImageDownloadEnum,
|
||||
ImageUploadEnum = inDto.ImageUploadEnum,
|
||||
@@ -1332,7 +1332,7 @@ namespace IRaCIS.Core.Application
|
||||
await _trialRepository.BatchUpdateNoTrackingAsync(u => u.Id == trialId, s => new Trial { TrialFinishedTime = DateTime.Now });
|
||||
|
||||
|
||||
if (_readingQuestionCriterionTrialRepository.Any(t => t.IsSigned && t.ImageUploadEnum != ReadingImageUpload.None))
|
||||
if (_readingQuestionCriterionTrialRepository.Any(t => t.TrialId == trial.Id && t.IsSigned && t.ImageUploadEnum != ReadingImageUpload.None))
|
||||
{
|
||||
await _oSSService.SetImmediateArchiveRule($"{trial.Id}/Image/");
|
||||
await _oSSService.SetImmediateArchiveRule($"{trial.Id}/TaskImage/");
|
||||
|
||||
Reference in New Issue
Block a user