修改答案
parent
bc4c523d88
commit
c93807d67f
|
|
@ -801,8 +801,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
{
|
{
|
||||||
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
||||||
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
{
|
||||||
|
answer = x.Answer;
|
||||||
|
}
|
||||||
return new ReadingTableQuestionAnswer
|
return new ReadingTableQuestionAnswer
|
||||||
{
|
{
|
||||||
Id = NewId.NextGuid(),
|
Id = NewId.NextGuid(),
|
||||||
|
|
|
||||||
|
|
@ -603,8 +603,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
{
|
{
|
||||||
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
||||||
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
{
|
||||||
|
answer = x.Answer;
|
||||||
|
}
|
||||||
|
|
||||||
return new ReadingTableQuestionAnswer
|
return new ReadingTableQuestionAnswer
|
||||||
{
|
{
|
||||||
Id = NewId.NextGuid(),
|
Id = NewId.NextGuid(),
|
||||||
|
|
|
||||||
|
|
@ -606,8 +606,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
{
|
{
|
||||||
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
||||||
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
{
|
||||||
|
answer = x.Answer;
|
||||||
|
}
|
||||||
return new ReadingTableQuestionAnswer
|
return new ReadingTableQuestionAnswer
|
||||||
{
|
{
|
||||||
Id = NewId.NextGuid(),
|
Id = NewId.NextGuid(),
|
||||||
|
|
|
||||||
|
|
@ -606,8 +606,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
{
|
{
|
||||||
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
||||||
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
{
|
||||||
|
answer = x.Answer;
|
||||||
|
}
|
||||||
return new ReadingTableQuestionAnswer
|
return new ReadingTableQuestionAnswer
|
||||||
{
|
{
|
||||||
Id = NewId.NextGuid(),
|
Id = NewId.NextGuid(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue