IRC_NewDev
parent
1caf4ff8e6
commit
9c244c6750
|
@ -899,6 +899,10 @@ namespace IRaCIS.Application.Services
|
|||
noteEqual = true;
|
||||
break;
|
||||
}
|
||||
else if (noteEqual)
|
||||
{
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
var taskAnswer1 = item.TaskAnswerList[0];
|
||||
|
@ -943,9 +947,9 @@ namespace IRaCIS.Application.Services
|
|||
var deffaultValue = taskAnswer1.IsNullOrEmptyReturn0() - taskAnswer2.IsNullOrEmptyReturn0();
|
||||
if (deffaultValue < 0)
|
||||
{
|
||||
deffaultValue =0 -deffaultValue;
|
||||
deffaultValue = 0 - deffaultValue;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (item.JudgeDifferenceType == JudgeDifferenceType.Greater)
|
||||
{
|
||||
|
@ -954,18 +958,18 @@ namespace IRaCIS.Application.Services
|
|||
noteEqual = true;
|
||||
}
|
||||
}
|
||||
else if(item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual)
|
||||
else if (item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual)
|
||||
{
|
||||
if (deffaultValue >= item.JudgeDifferenceValue)
|
||||
{
|
||||
noteEqual = true;
|
||||
}
|
||||
}
|
||||
if (deffaultValue >= item.JudgeDifferenceValue)
|
||||
{
|
||||
noteEqual = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
break;
|
||||
case JudgeTypeEnum.PercentageDifference:
|
||||
|
||||
break;
|
||||
case JudgeTypeEnum.PercentageDifference:
|
||||
var value1 = taskAnswer1.IsNullOrEmptyReturn0();
|
||||
var value2 = taskAnswer2.IsNullOrEmptyReturn0();
|
||||
if (value1 == 0 || value2 == 0)
|
||||
|
@ -975,37 +979,37 @@ namespace IRaCIS.Application.Services
|
|||
else
|
||||
{
|
||||
|
||||
if (item.JudgeDifferenceType == JudgeDifferenceType.Greater)
|
||||
{
|
||||
if (value1 < value2)
|
||||
{
|
||||
noteEqual = (value2 - value1) * 100 / value1 > item.JudgeDifferenceValue;
|
||||
if (item.JudgeDifferenceType == JudgeDifferenceType.Greater)
|
||||
{
|
||||
if (value1 < value2)
|
||||
{
|
||||
noteEqual = (value2 - value1) * 100 / value1 > item.JudgeDifferenceValue;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
noteEqual = (value1 - value2) * 100 / value2 > item.JudgeDifferenceValue;
|
||||
}
|
||||
}
|
||||
else if (item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual)
|
||||
{
|
||||
if (value1 < value2)
|
||||
{
|
||||
noteEqual = (value2 - value1) * 100 / value1 >= item.JudgeDifferenceValue;
|
||||
}
|
||||
else
|
||||
{
|
||||
noteEqual = (value1 - value2) * 100 / value2 > item.JudgeDifferenceValue;
|
||||
}
|
||||
}
|
||||
else if (item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual)
|
||||
{
|
||||
if (value1 < value2)
|
||||
{
|
||||
noteEqual = (value2 - value1) * 100 / value1 >= item.JudgeDifferenceValue;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
noteEqual = (value1 - value2) * 100 / value2 >= item.JudgeDifferenceValue;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
noteEqual = (value1 - value2) * 100 / value2 >= item.JudgeDifferenceValue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
default:
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue