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

修改

Uat_Study
he 2023-01-13 14:17:07 +08:00
parent 68788c5294
commit ab0d75903a
3 changed files with 14 additions and 6 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

@ -4454,6 +4454,11 @@
问题英文分组 问题英文分组
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto.QuestionName">
<summary>
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto.CustomCalculateMark"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto.CustomCalculateMark">
<summary> <summary>
自定义计算标记 自定义计算标记

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -1140,6 +1140,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? ReadingQuestionId { get; set; } public Guid? ReadingQuestionId { get; set; }
public bool IsGetAll { get; set; } = false;
} }

13
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -420,7 +420,7 @@ namespace IRaCIS.Application.Services
{ {
var relationList = await GetQuestionCalculateRelation(new GetQuestionCalculateRelationInDto() var relationList = await GetQuestionCalculateRelation(new GetQuestionCalculateRelationInDto()
{ {
IsGetAll=true,
TrialReadingCriterionId = indto.ReadingQuestionCriterionTrialId, TrialReadingCriterionId = indto.ReadingQuestionCriterionTrialId,
}); });
@ -504,8 +504,8 @@ namespace IRaCIS.Application.Services
{ {
if (inDto.TrialReadingCriterionId != null) if (inDto.TrialReadingCriterionId != null)
{ {
return await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId return await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
&&x.DataSource== DataSources.Automatic&&x.Type== "number") .WhereIf(!inDto.IsGetAll,x=>x.DataSource== DataSources.Automatic&&x.Type== "number")
.Select(x => new CalculateRelationDto() .Select(x => new CalculateRelationDto()
{ {
QuestionId = x.Id, QuestionId = x.Id,
@ -520,7 +520,8 @@ namespace IRaCIS.Application.Services
} }
else else
{ {
return await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId && x.DataSource == DataSources.Automatic && x.Type == "number") return await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId)
.WhereIf(!inDto.IsGetAll, x => x.DataSource == DataSources.Automatic && x.Type == "number")
.Select(x => new CalculateRelationDto() .Select(x => new CalculateRelationDto()
{ {
QuestionId = x.Id, QuestionId = x.Id,
@ -673,9 +674,9 @@ namespace IRaCIS.Application.Services
{ {
var relationList = await GetQuestionCalculateRelation(new GetQuestionCalculateRelationInDto() var relationList = await GetQuestionCalculateRelation(new GetQuestionCalculateRelationInDto()
{ {
IsGetAll = true,
ReadingQuestionId = indto.ReadingQuestionId, ReadingQuestionId = indto.ReadingQuestionId,
}); }) ;
var relation = relationList.FirstOrDefault(x => x.QuestionId == indto.Id); var relation = relationList.FirstOrDefault(x => x.QuestionId == indto.Id);
List<CalculateInfo> calculateInfoList = new List<CalculateInfo>(); List<CalculateInfo> calculateInfoList = new List<CalculateInfo>();