YD/YD_Event.Admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: YD:22f60b48be23ff2103d166804d0e32cfa311296e
Branches Tags
YD:main
YD:dev_2.0
YD:feautre/register
YD:miniapp_2.0
YD:hotfix
...
compare: YD:d35b9d3b614ce52defcec6b41aef74049b702cde
Branches Tags
YD:main
YD:dev_2.0
YD:feautre/register
YD:miniapp_2.0
YD:hotfix

2 Commits
22f60b48be ... d35b9d3b61

Author SHA1 Message Date
ltx
d35b9d3b61 Merge branch 'main' of http://8.153.108.90:3000/YD/YD_Event.Admin 2026-10-13 09:02:09 +08:00
ltx
a3b4b75eb8 修正时必须回填原评分单的手工录入值。 2026-10-13 09:02:06 +08:00
1 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

9
YD_Event.Application/Judge/JudgeScoringController.cs
View File

@ -364,7 +364,7 @@ public class JudgeScoringController : IDynamicApiController
var source = draft ?? submitted; var source = draft ?? submitted;
var details = source == null var details = source == null
? new List<EventJudgeScoreDetail>() ? new List<EventJudgeScoreDetail>()
: await _detailRepository.GetListAsync(x => x.ScoreSheetId == source.Id); : await _detailRepository.GetListAsync(x => x.ScoreSheetId == source.Id && !x.DeleteMark);
var legacyInteraction = roleType == "T" var legacyInteraction = roleType == "T"
&& (ctx.Config.RuleType.ToUpperInvariant() is "FREESTYLE_DOUBLE_SYNC" or "FREESTYLE_QUAD_SYNC") && (ctx.Config.RuleType.ToUpperInvariant() is "FREESTYLE_DOUBLE_SYNC" or "FREESTYLE_QUAD_SYNC")
? details.FirstOrDefault(x => x.ItemCode == "REQ_INTERACTION") : null; ? details.FirstOrDefault(x => x.ItemCode == "REQ_INTERACTION") : null;
@ -434,6 +434,9 @@ public class JudgeScoringController : IDynamicApiController
Items = definitions.Select(definition => Items = definitions.Select(definition =>
{ {
var line = preview.Lines.FirstOrDefault(x => string.Equals(x.ItemCode, definition.ItemCode, StringComparison.OrdinalIgnoreCase)); 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 return new JudgeScoreItemDto
{ {
ScoreRuleItemId = definition.Item.Id, ScoreRuleItemId = definition.Item.Id,
@ -463,8 +466,8 @@ public class JudgeScoringController : IDynamicApiController
RequiredTarget = definition.RequiredTarget, RequiredTarget = definition.RequiredTarget,
RequiredAsCategory = definition.RequiredAsCategory, RequiredAsCategory = definition.RequiredAsCategory,
Sort = definition.Item.Sort, Sort = definition.Item.Sort,
InputValue = line?.InputValue, InputValue = savedInput?.InputValue ?? line?.InputValue,
CountValue = line?.CountValue, CountValue = savedInput?.CountValue ?? line?.CountValue,
Subtotal = line?.Subtotal ?? 0m Subtotal = line?.Subtotal ?? 0m
}; };
}).ToList(), }).ToList(),