修改答案
This commit is contained in:
@@ -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 answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
||||
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||
{
|
||||
answer = x.Answer;
|
||||
}
|
||||
return new ReadingTableQuestionAnswer
|
||||
{
|
||||
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 answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
||||
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||
{
|
||||
answer = x.Answer;
|
||||
}
|
||||
|
||||
return new ReadingTableQuestionAnswer
|
||||
{
|
||||
Id = NewId.NextGuid(),
|
||||
|
||||
@@ -604,10 +604,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||
var tableAnswers = copyTableAnswers
|
||||
.Select(x =>
|
||||
{
|
||||
var rowId = tableRowAnswers .Where(y => y.OriginalId == x.RowId) .Select(y => y.Id).FirstOrDefault();
|
||||
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty: x.Answer;
|
||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
||||
var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
|
||||
var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||
{
|
||||
answer = x.Answer;
|
||||
}
|
||||
return new ReadingTableQuestionAnswer
|
||||
{
|
||||
Id = NewId.NextGuid(),
|
||||
|
||||
+4
-2
@@ -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 answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
|
||||
if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
|
||||
answer = TargetState.Loss.GetEnumInt().ToString();
|
||||
if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
|
||||
{
|
||||
answer = x.Answer;
|
||||
}
|
||||
return new ReadingTableQuestionAnswer
|
||||
{
|
||||
Id = NewId.NextGuid(),
|
||||
|
||||
Reference in New Issue
Block a user