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

修改导出标志2
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-11-19 15:46:43 +08:00
parent eaf3d5e3e8
commit e3622cb86f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -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 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 (maxFinishedJudge == null && maxNotFinishedJudge != null)
{ {
if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum) if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum)
@ -1554,8 +1554,10 @@ namespace IRaCIS.Core.Application.Service.Common
visitItem.IsTrigerJudge = null; visitItem.IsTrigerJudge = null;
visitItem.IsJudgeSelect = null; visitItem.IsJudgeSelect = null;
} }
} }
//全局裁判都完成了，那么以最后一次裁判选择的为准 //n个全局裁判都完成了，那么以最后一次裁判选择的为准
else if (maxFinishedJudge != null && maxNotFinishedJudge == null) else if (maxFinishedJudge != null && maxNotFinishedJudge == null)
{ {
if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum) if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum)