XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-05-28 10:00:32 +08:00
parent a3f12b2a53 cc00cce704
commit 5e48ed1e23
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -899,6 +899,10 @@ namespace IRaCIS.Application.Services
noteEqual = true; noteEqual = true;
break; break;
} }
else if (noteEqual)
{
break;
}
else else
{ {
var taskAnswer1 = item.TaskAnswerList[0]; var taskAnswer1 = item.TaskAnswerList[0];
@ -943,9 +947,9 @@ namespace IRaCIS.Application.Services
var deffaultValue = taskAnswer1.IsNullOrEmptyReturn0() - taskAnswer2.IsNullOrEmptyReturn0(); var deffaultValue = taskAnswer1.IsNullOrEmptyReturn0() - taskAnswer2.IsNullOrEmptyReturn0();
if (deffaultValue < 0) if (deffaultValue < 0)
{ {
deffaultValue =0 -deffaultValue; deffaultValue = 0 - deffaultValue;
} }
if (item.JudgeDifferenceType == JudgeDifferenceType.Greater) if (item.JudgeDifferenceType == JudgeDifferenceType.Greater)
{ {
@ -954,18 +958,18 @@ namespace IRaCIS.Application.Services
noteEqual = true; noteEqual = true;
} }
} }
else if(item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual) else if (item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual)
{ {
if (deffaultValue >= item.JudgeDifferenceValue) if (deffaultValue >= item.JudgeDifferenceValue)
{ {
noteEqual = true; noteEqual = true;
} }
} }
break;
case JudgeTypeEnum.PercentageDifference: break;
case JudgeTypeEnum.PercentageDifference:
var value1 = taskAnswer1.IsNullOrEmptyReturn0(); var value1 = taskAnswer1.IsNullOrEmptyReturn0();
var value2 = taskAnswer2.IsNullOrEmptyReturn0(); var value2 = taskAnswer2.IsNullOrEmptyReturn0();
if (value1 == 0 || value2 == 0) if (value1 == 0 || value2 == 0)
@ -975,37 +979,37 @@ namespace IRaCIS.Application.Services
else else
{ {
if (item.JudgeDifferenceType == JudgeDifferenceType.Greater) if (item.JudgeDifferenceType == JudgeDifferenceType.Greater)
{ {
if (value1 < value2) if (value1 < value2)
{ {
noteEqual = (value2 - value1) * 100 / value1 > item.JudgeDifferenceValue; noteEqual = (value2 - value1) * 100 / value1 > item.JudgeDifferenceValue;
} }
else else
{ {
noteEqual = (value1 - value2) * 100 / value2 > item.JudgeDifferenceValue; noteEqual = (value1 - value2) * 100 / value2 > item.JudgeDifferenceValue;
} }
} }
else if (item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual) else if (item.JudgeDifferenceType == JudgeDifferenceType.AboveOrEqual)
{ {
if (value1 < value2) if (value1 < value2)
{ {
noteEqual = (value2 - value1) * 100 / value1 >= item.JudgeDifferenceValue; 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; break;
} }
} }