修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
fb2d2f7b2f
commit
c64b826266
|
@ -287,7 +287,14 @@ namespace IRaCIS.Core.Application.ViewModel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public class GetConsistentRuleOut
|
||||||
|
{
|
||||||
|
public TaskConsistentRuleBasic? ConsistentRuleBasic { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 任务展示访视 读片任务显示是否顺序
|
||||||
|
/// </summary>
|
||||||
|
public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder;
|
||||||
|
}
|
||||||
|
|
||||||
///<summary>TaskConsistentRuleQuery 列表查询参数模型</summary>
|
///<summary>TaskConsistentRuleQuery 列表查询参数模型</summary>
|
||||||
public class TaskConsistentRuleQuery
|
public class TaskConsistentRuleQuery
|
||||||
|
|
|
@ -785,16 +785,16 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
|
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<(TaskConsistentRuleBasic?,object)> GetConsistentRule(TaskConsistentRuleQuery inQuery)
|
public async Task<GetConsistentRuleOut> GetConsistentRule(TaskConsistentRuleQuery inQuery)
|
||||||
{
|
{
|
||||||
|
|
||||||
var IsReadingTaskViewInOrder = await _trialReadingCriterionRepository.Where(x => x.Id == inQuery.TrialReadingCriterionId).Select(x => x.IsReadingTaskViewInOrder).FirstNotNullAsync();
|
var IsReadingTaskViewInOrder = await _trialReadingCriterionRepository.Where(x => x.Id == inQuery.TrialReadingCriterionId).Select(x => x.IsReadingTaskViewInOrder).FirstNotNullAsync();
|
||||||
var result = await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
|
var result = await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
|
||||||
return (result,
|
return new GetConsistentRuleOut()
|
||||||
new {
|
{
|
||||||
IsReadingTaskViewInOrder= IsReadingTaskViewInOrder,
|
ConsistentRuleBasic = result,
|
||||||
}
|
IsReadingTaskViewInOrder = IsReadingTaskViewInOrder
|
||||||
);
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in New Issue