Compare commits

..

No commits in common. "51cfadbc77abc56555aa7faa5924370a7a876aaa" and "4050d7e4a37c578908e8dfb93f7cd26e0d37563d" have entirely different histories.

4 changed files with 11 additions and 34 deletions

View File

@ -1810,13 +1810,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List<string> AnswerGroup { get; set; } public List<string> AnswerGroup { get; set; }
/// <summary>
/// 裁判百分比或绝对值的相差值 public List<AnswerCombinationDto> AnswerCombination { get; set; }
/// </summary>
public decimal? JudgeDifferenceValue { get; set; }
public List<AnswerCombinationDto> AnswerCombination { get; set; }
@ -1826,13 +1821,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetTrialCriterionJudgeQuestionListOutDto public class GetTrialCriterionJudgeQuestionListOutDto
{ {
public Guid ReadingQuestionTrialId { get; set; } public Guid ReadingQuestionTrialId { get; set; }
/// <summary> public string QuestionName { get; set; }
/// 裁判百分比或绝对值的相差值
/// </summary>
public decimal? JudgeDifferenceValue { get; set; }
public string QuestionName { get; set; }
public string PageName { get; set; } public string PageName { get; set; }

View File

@ -46,8 +46,7 @@ namespace IRaCIS.Application.Services
QuestionGenre=x.QuestionGenre, QuestionGenre=x.QuestionGenre,
DictionaryCode=x.DictionaryCode, DictionaryCode=x.DictionaryCode,
JudgeType = x.JudgeType, JudgeType = x.JudgeType,
ReadingQuestionTrialId = x.Id, ReadingQuestionTrialId = x.Id
JudgeDifferenceValue= x.JudgeDifferenceValue
}).ToListAsync(); }).ToListAsync();
@ -71,9 +70,7 @@ namespace IRaCIS.Application.Services
{ {
AnswerGroup = JsonConvert.SerializeObject(inDto.AnswerGroup), AnswerGroup = JsonConvert.SerializeObject(inDto.AnswerGroup),
AnswerCombination = JsonConvert.SerializeObject(inDto.AnswerCombination), AnswerCombination = JsonConvert.SerializeObject(inDto.AnswerCombination),
JudgeDifferenceValue= inDto.JudgeDifferenceValue, JudgeType = inDto.JudgeType,
JudgeType = inDto.JudgeType,
}); });
var result = await _readingQuestionTrialRepository.SaveChangesAsync(); var result = await _readingQuestionTrialRepository.SaveChangesAsync();

View File

@ -2571,17 +2571,12 @@ public enum PET5PSScore
/// </summary> /// </summary>
AnswerCombination = 3, AnswerCombination = 3,
/// <summary> /// <summary>
/// 相差绝对值 /// 不计算
/// </summary> /// </summary>
DifferenceAbsoluteValue = 4, NotCalculate=4,
/// <summary> }
/// 相差百分比
/// </summary>
PercentageDifference = 5,
}

View File

@ -134,11 +134,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity;
/// <summary>
/// 裁判百分比或绝对值的相差值
/// </summary>
public decimal? JudgeDifferenceValue { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
/// </summary> /// </summary>