Compare commits
No commits in common. "d35b9d3b614ce52defcec6b41aef74049b702cde" and "22f60b48be23ff2103d166804d0e32cfa311296e" have entirely different histories.
d35b9d3b61
...
22f60b48be
@ -364,7 +364,7 @@ public class JudgeScoringController : IDynamicApiController
|
||||
var source = draft ?? submitted;
|
||||
var details = source == null
|
||||
? new List<EventJudgeScoreDetail>()
|
||||
: await _detailRepository.GetListAsync(x => x.ScoreSheetId == source.Id && !x.DeleteMark);
|
||||
: await _detailRepository.GetListAsync(x => x.ScoreSheetId == source.Id);
|
||||
var legacyInteraction = roleType == "T"
|
||||
&& (ctx.Config.RuleType.ToUpperInvariant() is "FREESTYLE_DOUBLE_SYNC" or "FREESTYLE_QUAD_SYNC")
|
||||
? details.FirstOrDefault(x => x.ItemCode == "REQ_INTERACTION") : null;
|
||||
@ -434,9 +434,6 @@ public class JudgeScoringController : IDynamicApiController
|
||||
Items = definitions.Select(definition =>
|
||||
{
|
||||
var line = preview.Lines.FirstOrDefault(x => string.Equals(x.ItemCode, definition.ItemCode, StringComparison.OrdinalIgnoreCase));
|
||||
// 修正时必须回填原评分单的手工录入值。预览用于重算自动项,不能作为历史录入的唯一来源。
|
||||
var savedInput = definition.IsAuto ? null : details.FirstOrDefault(x =>
|
||||
!x.IsAutoGenerated && string.Equals(x.ItemCode, definition.ItemCode, StringComparison.OrdinalIgnoreCase));
|
||||
return new JudgeScoreItemDto
|
||||
{
|
||||
ScoreRuleItemId = definition.Item.Id,
|
||||
@ -466,8 +463,8 @@ public class JudgeScoringController : IDynamicApiController
|
||||
RequiredTarget = definition.RequiredTarget,
|
||||
RequiredAsCategory = definition.RequiredAsCategory,
|
||||
Sort = definition.Item.Sort,
|
||||
InputValue = savedInput?.InputValue ?? line?.InputValue,
|
||||
CountValue = savedInput?.CountValue ?? line?.CountValue,
|
||||
InputValue = line?.InputValue,
|
||||
CountValue = line?.CountValue,
|
||||
Subtotal = line?.Subtotal ?? 0m
|
||||
};
|
||||
}).ToList(),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user