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

高亮修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net10
he 2026-06-09 16:07:12 +08:00
parent bafe61ae64
commit b64eed88cf
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -17510,17 +17510,17 @@
</member> </member>
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question"> <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
<summary> <summary>
质疑 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
</summary> </summary>
</member> </member>
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency"> <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
<summary> <summary>
一致性核查 һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto"> <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
<summary> <summary>
复制 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView"> <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">

41
IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
View File

@ -540,16 +540,53 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
break; break;
} }
Arm? highlightArm = null;
ArbitrationRule? highlightRule = null;
decimal? highlightVisitTaskNum = null;
if (r1.VisitTaskId != null && r2.VisitTaskList != null) if (r1.VisitTaskId != null && r2.VisitTaskList != null)
{ {
var judgeInfo = _visitTaskRepository.Where(x => x.SubjectId == inDto.SubjectId && x.TrialReadingCriterionId == inDto.TrialCriterionId var judgeInfo =await _visitTaskRepository.Where(x => x.SubjectId == inDto.SubjectId && x.TrialReadingCriterionId == inDto.TrialCriterionId
&& x.TaskState == TaskState.Effect && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect && x.ReadingTaskState == ReadingTaskState.HaveSigned
&& x.ReadingCategory== ReadingCategory.Judge && x.ReadingCategory== ReadingCategory.Judge
).OrderByDescending(x => x.VisitTaskNum).Include(x=>x.JudgeResultTask).FirstOrDefaultAsync(); ).OrderByDescending(x => x.VisitTaskNum).Include(x=>x.JudgeResultTask).FirstOrDefaultAsync();
if (judgeInfo != null && judgeInfo.JudgeResultTask != null)
{
if (judgeInfo.JudgeResultTask.ArmEnum == Arm.DoubleReadingArm1
|| judgeInfo.JudgeResultTask.ArmEnum == Arm.DoubleReadingArm2)
{
highlightArm = judgeInfo.JudgeResultTask.ArmEnum;
highlightRule = criterion.ArbitrationRule;
highlightVisitTaskNum = judgeInfo.VisitTaskNum;
}
}
}
void SetHighlight(List<EvaluationValue> data, Arm arm)
{
if (highlightArm != arm || highlightVisitTaskNum == null)
{
return;
}
if (highlightRule == ArbitrationRule.Reading)
{
for (var index = 0; index < data.Count && index < highlightVisitTaskNum.Value; index++)
{
data[index].IsHighlight = true;
}
}
else if (highlightRule == ArbitrationRule.Visit)
{
var index = decimal.ToInt32(decimal.Floor(highlightVisitTaskNum.Value));
if (index >= 0 && index < data.Count)
{
data[index].IsHighlight = true;
}
}
} }
@ -584,6 +621,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
r1data = r1data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length)) r1data = r1data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length))
.Take(length) .Take(length)
.ToList(); .ToList();
SetHighlight(r1data, Arm.DoubleReadingArm1);
result.Evaluation.Add(r1data); result.Evaluation.Add(r1data);
@ -615,6 +653,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
r2data = r2data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length)) r2data = r2data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length))
.Take(length) .Take(length)
.ToList(); .ToList();
SetHighlight(r2data, Arm.DoubleReadingArm2);
result.Evaluation.Add(r2data); result.Evaluation.Add(r2data);
} }