From eaf3d5e3e81926109af771211f3485217bb0a392 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 19 Nov 2024 15:13:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 94de45339..f0fff99f2 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1549,7 +1549,7 @@ namespace IRaCIS.Core.Application.Service.Common visitItem.IsJudgeSelect = null; } else - { + { //大于当前未完成的全局裁判 后续 肯定是未知的 visitItem.IsTrigerJudge = null; visitItem.IsJudgeSelect = null; @@ -1579,12 +1579,18 @@ namespace IRaCIS.Core.Application.Service.Common { //两个都不为null 肯定是不同的裁判 - //在完成裁判之后的，和未完成裁判之前的 - if (/*visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum &&*/ visitItem.VisitTaskNum > maxFinishedJudge.VisitTaskNum) + //在未完成裁判之后的 + if (visitItem.VisitTaskNum > maxNotFinishedJudge.VisitTaskNum) { visitItem.IsTrigerJudge = null; visitItem.IsJudgeSelect = null; } + //完成裁判之后的 ，和未完成裁判之前的 + else if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum && visitItem.VisitTaskNum > maxFinishedJudge.VisitTaskNum) + { + visitItem.IsTrigerJudge = true; + visitItem.IsJudgeSelect = null; + } else if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum) { visitItem.IsJudgeSelect = true;