Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
commit
891506824a
|
|
@ -759,6 +759,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
List<Guid> visitTaskids = new List<Guid>();
|
List<Guid> visitTaskids = new List<Guid>();
|
||||||
|
|
||||||
var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).AsNoTracking().FirstNotNullAsync();
|
var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).AsNoTracking().FirstNotNullAsync();
|
||||||
|
// 计算过 就不计算了
|
||||||
|
if(visitTask.IsCalculatedJudge)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// 是否是组件一致性
|
// 是否是组件一致性
|
||||||
var isGroupAnalysis = false;
|
var isGroupAnalysis = false;
|
||||||
|
|
@ -829,7 +834,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var noteEqual = false;
|
var noteEqual = false;
|
||||||
|
|
||||||
// 判断项目是否设置了裁判
|
// 判断项目是否设置了裁判
|
||||||
if (criterionInfo.IsArbitrationReading)
|
if (criterionInfo.IsArbitrationReading&& !visitTask.IsCalculatedJudge)
|
||||||
{
|
{
|
||||||
// 判断数量是否为2 是否仲裁
|
// 判断数量是否为2 是否仲裁
|
||||||
if (visitTaskids.Count == 2)
|
if (visitTaskids.Count == 2)
|
||||||
|
|
@ -977,6 +982,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => visitTaskids.Contains(x.Id), x => new VisitTask()
|
||||||
|
{
|
||||||
|
IsCalculatedJudge = true
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -1038,6 +1048,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x =>x.Id ==visitTask.Id, x => new VisitTask()
|
||||||
|
{
|
||||||
|
IsCalculatedJudge = true
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue