Compare commits

..

No commits in common. "f4a97b940a2fb0d34b09362fdf6292d9efffa168" and "cf9d42dc490cd1ef79edd27f59a749dfefd01220" have entirely different histories.

2 changed files with 2 additions and 19 deletions

View File

@ -124,10 +124,9 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<GetTrialQuestionExportResultOutDto> GetTrialQuestionExportResult(GetTrialQuestionExportResultInDto inDto)
{
List<string> notShowType=new List<string>() { ReadingQestionType.Group, ReadingQestionType.Screenshot, ReadingQestionType.Summary, ReadingQestionType.Upload };
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
var questionList = await _readingQuestionTrialRepository.Where(x => !notShowType.Contains(x.Type) && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
var questionList = await _readingQuestionTrialRepository.Where(x => x.Type != ReadingQestionType.Group && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
.OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport()
{
QuestionId = x.Id,
@ -141,7 +140,6 @@ namespace IRaCIS.Core.Application.Service
var questionid = questionList.Select(x => x.QuestionId).ToList();
var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => questionid.Contains(x.ReadingQuestionId))
.Where(x => !notShowType.Contains(x.Type))
.OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport()
{
QuestionId = x.ReadingQuestionId,

View File

@ -16,21 +16,6 @@ namespace IRaCIS.Core.Domain.Share
public static readonly string BasicTable = "basicTable";
public static readonly string Group = "group";
/// <summary>
/// 截图
/// </summary>
public static readonly string Screenshot = "screenshot";
/// <summary>
/// 小结
/// </summary>
public static readonly string Summary = "summary";
/// <summary>
/// 附件
/// </summary>
public static readonly string Upload = "upload";
}