From e3622cb86ff7295bb0d21c6a480018be6c93f662 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 19 Nov 2024 15:46:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=A0=87?= =?UTF-8?q?=E5=BF=972?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index f0fff99f2..03a7dbd43 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1538,10 +1538,10 @@ namespace IRaCIS.Core.Application.Service.Common var maxFinishedJudge = judegeList.Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault(); - var maxNotFinishedJudge = judegeList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned).FirstOrDefault(); + var maxNotFinishedJudge = judegeList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault(); - //有一个未完成的全局裁判，那么都是null + //n个裁判任务都未完成 if (maxFinishedJudge == null && maxNotFinishedJudge != null) { if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum) @@ -1554,8 +1554,10 @@ namespace IRaCIS.Core.Application.Service.Common visitItem.IsTrigerJudge = null; visitItem.IsJudgeSelect = null; } + + } - //全局裁判都完成了，那么以最后一次裁判选择的为准 + //n个全局裁判都完成了，那么以最后一次裁判选择的为准 else if (maxFinishedJudge != null && maxNotFinishedJudge == null) { if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum)