From d679d2e788c7faecfd75813b9e2874a63c97397b Mon Sep 17 00:00:00 2001
From: ltx <1006158920@qq.com>
Date: Thu, 24 Sep 2026 16:39:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=E8=A1=A8=E7=8E=B0?=
=?UTF-8?q?=E5=88=86=E5=A4=B1=E8=AF=AF=E6=89=A3=E5=87=8F=E7=9A=84=E6=9C=8D?=
=?UTF-8?q?=E5=8A=A1=E7=AB=AF=E9=87=8D=E7=AE=97=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 表现维度计算同时扣除失误联动减号和独立失误次数
- 更新服务端计算步骤说明，使其与裁判端展示口径一致
- 保持裁判端上传人工减号与失误次数分离，由服务端重算
---
.../Scoring/ScoreSheetCalculationService.cs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/YD_Event.Application/Scoring/ScoreSheetCalculationService.cs b/YD_Event.Application/Scoring/ScoreSheetCalculationService.cs
index 22be844..146f2e3 100644
--- a/YD_Event.Application/Scoring/ScoreSheetCalculationService.cs
+++ b/YD_Event.Application/Scoring/ScoreSheetCalculationService.cs
@@ -254,7 +254,8 @@ public static class ScoreSheetCalculationService
}
///
- /// 表现维度计算。每个维度 = 基准分 + 人工加 - 人工减 - 失误自动减，限制在上下限内，
+ /// 表现维度计算。页面减数量 = 人工减 + 失误自动减；按规则公式还需单独减失误次数。
+ /// 每个维度 = 基准分 + 人工加 - (人工减 + 失误自动减) - 失误次数，限制在上下限内，
/// 再按各维度权重加权求和得到本裁判的表现分。失误自动减分作为自动项落明细，裁判不可直接修改。
///
private static void ApplyPerformanceDimensions(List definitions,
@@ -285,7 +286,8 @@ public static class ScoreSheetCalculationService
.FirstOrDefault(x => string.Equals(x.ItemCode, adjust.ItemCode, StringComparison.OrdinalIgnoreCase))?.CountValue ?? 0m;
raw += adjust.AdjustSign * count * (adjust.Item.UnitValue ?? 1m);
}
- raw -= failureCount * (dimension.Item.UnitValue ?? 1m);
+ // 失误同时增加页面减数量，并作为公式中的独立失误项再扣一次。
+ raw -= failureCount * 2m * (dimension.Item.UnitValue ?? 1m);
// 维度分限制在规则给出的上下限内（规程为 0~24）并取整。
var value = Math.Clamp(Math.Round(raw, 0, MidpointRounding.AwayFromZero), dimension.MinValue, dimension.MaxValue);
weighted += value * dimension.DimensionWeight!.Value;
@@ -302,7 +304,7 @@ public static class ScoreSheetCalculationService
result.Steps.Add(new ScoreSheetStep
{
Code = $"DIM_{dimension.DimensionCode}", Label = dimension.Item.ItemName,
- Formula = $"{Trim(dimension.BaseValue ?? 0m)} + 人工加 - 人工减 - 失误{Trim(failureCount)}次",
+ Formula = $"{Trim(dimension.BaseValue ?? 0m)} + 人工加 - (人工减 + 失误联动减{Trim(failureCount)}) - 失误{Trim(failureCount)}次",
Value = value
});
}