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;