修改一版
parent
0d8fb1df93
commit
2daa2fdb13
|
@ -677,6 +677,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string RelevanceValue { get; set; } = string.Empty;
|
public string RelevanceValue { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 图片数量
|
||||||
|
/// </summary>
|
||||||
|
public int ImageCount { get; set; }
|
||||||
|
|
||||||
public List<GetTrialReadingQuestionOutDto> Childrens { get; set; }
|
public List<GetTrialReadingQuestionOutDto> Childrens { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -514,6 +514,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 关联Value
|
/// 关联Value
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string RelevanceValue { get; set; } = string.Empty;
|
public string RelevanceValue { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// 图片数量
|
||||||
|
/// </summary>
|
||||||
|
public int ImageCount { get; set; }
|
||||||
}
|
}
|
||||||
public class AddOrUpdateReadingQuestionSystemInDto
|
public class AddOrUpdateReadingQuestionSystemInDto
|
||||||
{
|
{
|
||||||
|
|
|
@ -674,6 +674,7 @@ namespace IRaCIS.Application.Services
|
||||||
ShowOrder = data.ShowOrder,
|
ShowOrder = data.ShowOrder,
|
||||||
RelevanceId=data.RelevanceId,
|
RelevanceId=data.RelevanceId,
|
||||||
RelevanceValue=data.RelevanceValue,
|
RelevanceValue=data.RelevanceValue,
|
||||||
|
ImageCount=data.ImageCount,
|
||||||
ParentId = data.ParentId,
|
ParentId = data.ParentId,
|
||||||
TypeValue = data.TypeValue,
|
TypeValue = data.TypeValue,
|
||||||
Answer = leftquestionAnswer.Answer,
|
Answer = leftquestionAnswer.Answer,
|
||||||
|
|
|
@ -289,6 +289,7 @@ namespace IRaCIS.Application.Services
|
||||||
ReadingCriterionPageId = x.ReadingCriterionPageId,
|
ReadingCriterionPageId = x.ReadingCriterionPageId,
|
||||||
RelevanceId=x.RelevanceId,
|
RelevanceId=x.RelevanceId,
|
||||||
RelevanceValue=x.RelevanceValue,
|
RelevanceValue=x.RelevanceValue,
|
||||||
|
ImageCount=x.ImageCount,
|
||||||
ParentId = x.ParentId,
|
ParentId = x.ParentId,
|
||||||
ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId,
|
ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId,
|
||||||
ReadingQuestionSystemId = x.ReadingQuestionSystemId,
|
ReadingQuestionSystemId = x.ReadingQuestionSystemId,
|
||||||
|
@ -331,6 +332,7 @@ namespace IRaCIS.Application.Services
|
||||||
QuestionName=c.system.QuestionName,
|
QuestionName=c.system.QuestionName,
|
||||||
ReadingCriterionPageId=c.trial.FirstOrDefault()?.ReadingCriterionPageId,
|
ReadingCriterionPageId=c.trial.FirstOrDefault()?.ReadingCriterionPageId,
|
||||||
RelevanceId = c.trial.FirstOrDefault()?.RelevanceId,
|
RelevanceId = c.trial.FirstOrDefault()?.RelevanceId,
|
||||||
|
ImageCount = c.trial.FirstOrDefault()?.ImageCount??0,
|
||||||
RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue,
|
RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue,
|
||||||
ReadingQuestionCriterionTrialId = item.Id,
|
ReadingQuestionCriterionTrialId = item.Id,
|
||||||
Remark=c.system.Remark,
|
Remark=c.system.Remark,
|
||||||
|
|
|
@ -621,8 +621,6 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
|
|
||||||
public FormType? FormType { get; set; }
|
public FormType? FormType { get; set; }
|
||||||
|
|
||||||
public int ImageCount { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目标准Id
|
/// 项目标准Id
|
||||||
|
@ -707,8 +705,6 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
public int? DigitPlaces { get; set; }
|
public int? DigitPlaces { get; set; }
|
||||||
|
|
||||||
|
|
||||||
public int ImageCount { get; set; }
|
|
||||||
|
|
||||||
public bool IsSignSave { get; set; } = false;
|
public bool IsSignSave { get; set; } = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -229,7 +229,7 @@ namespace IRaCIS.Core.Application
|
||||||
result.DigitPlaces = trialCriterion.DigitPlaces;
|
result.DigitPlaces = trialCriterion.DigitPlaces;
|
||||||
result.TrialCriterionId = trialCriterion.Id;
|
result.TrialCriterionId = trialCriterion.Id;
|
||||||
result.FormType = trialCriterion.FormType;
|
result.FormType = trialCriterion.FormType;
|
||||||
result.ImageCount=trialCriterion.ImageCount;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId
|
result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId
|
||||||
|
@ -265,7 +265,7 @@ namespace IRaCIS.Core.Application
|
||||||
{
|
{
|
||||||
FormType = inDto.FormType,
|
FormType = inDto.FormType,
|
||||||
DigitPlaces = inDto.DigitPlaces,
|
DigitPlaces = inDto.DigitPlaces,
|
||||||
ImageCount=inDto.ImageCount,
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -71,10 +71,7 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? DigitPlaces { get; set; } = 2;
|
public int? DigitPlaces { get; set; } = 2;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 图片数量
|
|
||||||
/// </summary>
|
|
||||||
public int ImageCount { get; set; } = 0;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 评估结果
|
/// 评估结果
|
||||||
|
|
|
@ -127,6 +127,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string RelevanceValue { get; set; }=string.Empty;
|
public string RelevanceValue { get; set; }=string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 图片数量
|
||||||
|
/// </summary>
|
||||||
|
public int ImageCount { get; set; } = 0;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 分页标准
|
/// 分页标准
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue