feat: 团体奖牌 / 个人积分两个榜单的专属明细导出
用户答复「允许细化」——给另外两个榜单各做一份逐项来源导出（此前它们的「明细」共用 单位积分明细、个人榜连明细列都没有）。 - `GET /api/export/medals.xlsx` → `团体奖牌明细.xlsx`：总表 单位/大项/小项/组别/名次/奖牌/运动员-队 + 每个有奖牌的单位一张分表（末尾小计 金X/银Y/铜Z）；无奖牌的单位不出分表。 去重与牌色判定**完全交给 domain**（每组调 domain.BuildMedalStandings），导出侧只做 「同一报名项归一组」，不复制任何计奖规则——双计通道只记一枚奖牌因此自动成立。 - `GET /api/export/athletes.xlsx` → `个人积分总明细.xlsx`：总表 单位/运动员/大项/小项/组别/ 名次/成绩/得分/来源 + 每个有得分的单位一张分表（按单位分，不按人分）。 得分取**记到个人的原始分**（与个人积分榜同一口径，不看 count_to_team、不乘折算系数）。 - 管理端三个榜单的卡片头各一个导出入口（导出总明细 / 导出奖牌明细 / 导出个人明细）， 展开单位时明细卡头是「导出该单位明细」；导出页仍是 5 项，两个新导出只在积分榜页触发。 护栏（跨端点一致性，都有实测断言）： - 奖牌明细逐单位与「团体奖牌榜」对齐，双计项目只出一行； - 个人明细合计与「个人积分榜」一致，且把折算系数改成 0.5 后个人明细一分不变、单位总分变 5。 测试：服务端 12 包全绿（358 个测试函数）；前端 vue-tsc 通过、190 例全过；Console 18 文件。 docs/ 与 devdocs/ 同步（FAQ 到 Q72，含上一轮"个人积分榜不能导出"的修正）。
This commit is contained in:
AskaEth committed
1 parent
782a38f82f
commit
8e707e1e9b
15 files changed
+1546
-45
No files matched your search
@@ -0,0 +1,256 @@
|
||||
package export
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"io"
|
||||
"sort"
|
||||
"strconv"
|
||||
|
||||
"github.com/xuri/excelize/v2"
|
||||
|
||||
"git.yeij.top/AskaEth/Scoreboard/server/internal/domain"
|
||||
)
|
||||
|
||||
// athleteDetailSheet 是「个人积分总明细」总表的表名。
|
||||
const athleteDetailSheet = "个人积分总明细"
|
||||
|
||||
// AthleteDetailRow 是个人得分明细的一行：某运动员一次得分的来源。
|
||||
// Points 是记到个人的原始分，与个人积分榜同口径，不乘 individual_to_team_weight。
|
||||
type AthleteDetailRow struct {
|
||||
AthleteName string
|
||||
SportName string
|
||||
EventName string
|
||||
Category string
|
||||
Rank int
|
||||
ResultText string
|
||||
Points float64
|
||||
Source string
|
||||
|
||||
// 排序键与所属单位，只在本包内用，不导出。
|
||||
teamID int64
|
||||
sportSort int
|
||||
eventSort int
|
||||
catSort int
|
||||
eventID int64
|
||||
categoryID int64
|
||||
ledgerID int64
|
||||
}
|
||||
|
||||
// AthleteDetailSheet 是某个单位的一张分表（按单位分表，不按人分）。
|
||||
type AthleteDetailSheet struct {
|
||||
Team domain.Team
|
||||
Rows []AthleteDetailRow
|
||||
}
|
||||
|
||||
// AthleteDetailWorkbook 是「个人积分总明细」的内容：一张总表 + 每个有得分的单位一张分表。
|
||||
type AthleteDetailWorkbook struct {
|
||||
Meta Meta
|
||||
Sheets []AthleteDetailSheet
|
||||
}
|
||||
|
||||
var athleteDetailColumns = []column{
|
||||
{"单位", 22, kindText},
|
||||
{"运动员", 14, kindText},
|
||||
{"大项", 14, kindText},
|
||||
{"小项", 18, kindText},
|
||||
{"组别", 14, kindText},
|
||||
{"名次", 8, kindCenter},
|
||||
{"成绩", 12, kindCenter},
|
||||
{"得分", 8, kindNumber},
|
||||
{"来源", 12, kindCenter},
|
||||
}
|
||||
|
||||
// athleteTeamColumns 是单位分表的列：与总表一致，去掉「单位」列。
|
||||
var athleteTeamColumns = athleteDetailColumns[1:]
|
||||
|
||||
// ExportAthleteDetailXLSX 导出个人得分明细，落盘到 dst。
|
||||
func ExportAthleteDetailXLSX(db *sql.DB, dst string, opts Options) error {
|
||||
wb, err := LoadAthleteDetailWorkbook(db, opts)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
f, err := athleteDetailFile(wb)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return saveWorkbook(f, dst)
|
||||
}
|
||||
|
||||
// WriteAthleteDetailXLSX 把个人得分明细写成 xlsx 流，供 HTTP 直接响应下载。
|
||||
func WriteAthleteDetailXLSX(w io.Writer, wb AthleteDetailWorkbook) error {
|
||||
f, err := athleteDetailFile(wb)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return f.Write(w)
|
||||
}
|
||||
|
||||
func athleteDetailFile(wb AthleteDetailWorkbook) (*excelize.File, error) {
|
||||
return buildWorkbook(athleteDetailSheet, func(f *excelize.File, st *styleSet) error {
|
||||
meta := wb.Meta.normalized()
|
||||
namer := &sheetNamer{}
|
||||
master := namer.add(athleteDetailSheet)
|
||||
if err := addSheet(f, master); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := writeSheet(f, st, master, meta, sheetTitle(meta, athleteDetailSheet),
|
||||
athleteDetailColumns, athleteMasterRows(wb.Sheets)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, s := range wb.Sheets {
|
||||
unit := displayName(s.Team.Name, s.Team.ShortName)
|
||||
name := namer.add(unit + "个人得分明细")
|
||||
if err := addSheet(f, name); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := writeSheet(f, st, name, meta, sheetTitle(meta, unit+" · 个人得分明细"),
|
||||
athleteTeamColumns, athleteTeamRows(s.Rows)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func athleteMasterRows(sheets []AthleteDetailSheet) [][]any {
|
||||
var out [][]any
|
||||
for _, s := range sheets {
|
||||
unit := displayName(s.Team.Name, s.Team.ShortName)
|
||||
for _, r := range s.Rows {
|
||||
out = append(out, append([]any{unit}, athleteRow(r)...))
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func athleteTeamRows(rows []AthleteDetailRow) [][]any {
|
||||
out := make([][]any, 0, len(rows))
|
||||
for _, r := range rows {
|
||||
out = append(out, athleteRow(r))
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func athleteRow(r AthleteDetailRow) []any {
|
||||
rank := ""
|
||||
if r.Rank > 0 {
|
||||
rank = strconv.Itoa(r.Rank)
|
||||
}
|
||||
return []any{r.AthleteName, r.SportName, r.EventName, r.Category, rank, r.ResultText, r.Points, r.Source}
|
||||
}
|
||||
|
||||
// LoadAthleteDetailWorkbook 读取记到个人的积分流水，逐条列出来源。
|
||||
//
|
||||
// 得分口径 = 个人积分榜：只取未作废且 athlete_id 非空的流水，points 保持原始分，
|
||||
// 既不乘 standings.individual_to_team_weight，也不按 count_to_team 过滤
|
||||
// （「个人+团体」项目的个人通道照样算在个人头上）。
|
||||
// 没有得分流水的运动员不会出现在任何一张表里。
|
||||
func LoadAthleteDetailWorkbook(db *sql.DB, opts Options) (AthleteDetailWorkbook, error) {
|
||||
if db == nil {
|
||||
return AthleteDetailWorkbook{}, ErrNoDatabase
|
||||
}
|
||||
meta, _, err := resolveMeta(db, opts.Meta)
|
||||
if err != nil {
|
||||
return AthleteDetailWorkbook{}, err
|
||||
}
|
||||
rows, err := loadAthleteDetailRows(db)
|
||||
if err != nil {
|
||||
return AthleteDetailWorkbook{}, err
|
||||
}
|
||||
byTeam := make(map[int64][]AthleteDetailRow, len(rows))
|
||||
for _, r := range rows {
|
||||
byTeam[r.teamID] = append(byTeam[r.teamID], r)
|
||||
}
|
||||
|
||||
teams, err := loadTeams(db, false)
|
||||
if err != nil {
|
||||
return AthleteDetailWorkbook{}, err
|
||||
}
|
||||
order, err := teamStandingsOrder(db, opts)
|
||||
if err != nil {
|
||||
return AthleteDetailWorkbook{}, err
|
||||
}
|
||||
orderTeamsByStandings(teams, order)
|
||||
|
||||
sheets := make([]AthleteDetailSheet, 0, len(teams))
|
||||
for _, t := range teams {
|
||||
teamRows := byTeam[t.ID]
|
||||
if len(teamRows) == 0 {
|
||||
continue
|
||||
}
|
||||
sortAthleteDetailRows(teamRows)
|
||||
sheets = append(sheets, AthleteDetailSheet{Team: t, Rows: teamRows})
|
||||
}
|
||||
return AthleteDetailWorkbook{Meta: meta, Sheets: sheets}, nil
|
||||
}
|
||||
|
||||
func loadAthleteDetailRows(db *sql.DB) ([]AthleteDetailRow, error) {
|
||||
rows, err := db.Query(`
|
||||
SELECT l.team_id, COALESCE(a.name, ''),
|
||||
COALESCE(s.name, ''), COALESCE(e.name, ''), COALESCE(c.name, ''),
|
||||
COALESCE(r.rank, 0), COALESCE(r.result_text, ''), COALESCE(r.unit, ''),
|
||||
l.points, l.source_type,
|
||||
COALESCE(s.sort_order, 0), COALESCE(e.sort_order, 0), COALESCE(c.sort_order, 0),
|
||||
COALESCE(l.event_id, 0), COALESCE(c.id, 0), l.id
|
||||
FROM score_ledger l
|
||||
LEFT JOIN athletes a ON a.id = l.athlete_id
|
||||
LEFT JOIN events e ON e.id = l.event_id
|
||||
LEFT JOIN sports s ON s.id = e.sport_id
|
||||
LEFT JOIN entries en ON en.id = l.entry_id
|
||||
LEFT JOIN event_categories c ON c.id = en.category_id
|
||||
LEFT JOIN results r ON r.id = l.result_id
|
||||
WHERE l.athlete_id IS NOT NULL AND l.athlete_id <> 0 AND l.voided = 0`)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("export: 读取个人得分明细: %w", err)
|
||||
}
|
||||
defer func() { _ = rows.Close() }()
|
||||
|
||||
var out []AthleteDetailRow
|
||||
for rows.Next() {
|
||||
var (
|
||||
row AthleteDetailRow
|
||||
source string
|
||||
resultText string
|
||||
unit string
|
||||
)
|
||||
if err := rows.Scan(&row.teamID, &row.AthleteName,
|
||||
&row.SportName, &row.EventName, &row.Category,
|
||||
&row.Rank, &resultText, &unit, &row.Points, &source,
|
||||
&row.sportSort, &row.eventSort, &row.catSort,
|
||||
&row.eventID, &row.categoryID, &row.ledgerID); err != nil {
|
||||
return nil, fmt.Errorf("export: 扫描个人得分明细: %w", err)
|
||||
}
|
||||
row.ResultText = displayResult(resultText, unit)
|
||||
row.Source = sourceLabel(source)
|
||||
out = append(out, row)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("export: 遍历个人得分明细: %w", err)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// sortAthleteDetailRows 按运动员分组、组内按项目既有顺序排列，读起来像「某人的得分清单」。
|
||||
func sortAthleteDetailRows(rows []AthleteDetailRow) {
|
||||
sort.SliceStable(rows, func(i, j int) bool {
|
||||
a, b := rows[i], rows[j]
|
||||
switch {
|
||||
case a.AthleteName != b.AthleteName:
|
||||
return a.AthleteName < b.AthleteName
|
||||
case a.sportSort != b.sportSort:
|
||||
return a.sportSort < b.sportSort
|
||||
case a.eventSort != b.eventSort:
|
||||
return a.eventSort < b.eventSort
|
||||
case a.eventID != b.eventID:
|
||||
return a.eventID < b.eventID
|
||||
case a.catSort != b.catSort:
|
||||
return a.catSort < b.catSort
|
||||
case a.categoryID != b.categoryID:
|
||||
return a.categoryID < b.categoryID
|
||||
default:
|
||||
return a.ledgerID < b.ledgerID
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,270 @@
|
||||
package export
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func insertAthlete(t *testing.T, db *sql.DB, name string, teamID int64) int64 {
|
||||
t.Helper()
|
||||
res, err := db.Exec(`INSERT INTO athletes(name, gender, team_id) VALUES (?, '男', ?)`, name, teamID)
|
||||
if err != nil {
|
||||
t.Fatalf("造运动员 %s: %v", name, err)
|
||||
}
|
||||
id, err := res.LastInsertId()
|
||||
if err != nil {
|
||||
t.Fatalf("取运动员 id: %v", err)
|
||||
}
|
||||
return id
|
||||
}
|
||||
|
||||
// 个人得分明细：总表 + 每个有得分的单位一张分表，逐条列出得分来源。
|
||||
func TestExportAthleteDetailXLSX(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db) // T1 张三 10 分、T2 李四 8 分
|
||||
|
||||
dst := filepath.Join(t.TempDir(), "个人.xlsx")
|
||||
if err := ExportAthleteDetailXLSX(db, dst, Options{}); err != nil {
|
||||
t.Fatalf("导出个人得分明细: %v", err)
|
||||
}
|
||||
f := openXLSX(t, dst)
|
||||
defer func() { _ = f.Close() }()
|
||||
|
||||
want := []string{"个人积分总明细", "第一分公司个人得分明细", "第二分公司个人得分明细"}
|
||||
if got := f.GetSheetList(); !equalStrings(got, want) {
|
||||
t.Fatalf("sheet 列表 = %v，期望 %v", got, want)
|
||||
}
|
||||
|
||||
master, err := f.GetRows("个人积分总明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取总表: %v", err)
|
||||
}
|
||||
if len(master) != 6 { // 4 行版式 + 2 条流水
|
||||
t.Fatalf("总表行数 = %d，期望 6", len(master))
|
||||
}
|
||||
header := []string{"单位", "运动员", "大项", "小项", "组别", "名次", "成绩", "得分", "来源"}
|
||||
for i, want := range header {
|
||||
if got := cell(master, 3, i); got != want {
|
||||
t.Errorf("表头第 %d 列 = %q，期望 %q", i, got, want)
|
||||
}
|
||||
}
|
||||
first := []string{"第一分公司", "张三", "田径", "100米跑", "男子", "1", "11.58 秒", "10", "成绩"}
|
||||
for i, want := range first {
|
||||
if got := cell(master, 4, i); got != want {
|
||||
t.Errorf("首行第 %d 列 = %q，期望 %q", i, got, want)
|
||||
}
|
||||
}
|
||||
|
||||
// 单位分表 = 总表去掉「单位」列。
|
||||
team, err := f.GetRows("第一分公司个人得分明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取单位分表: %v", err)
|
||||
}
|
||||
if len(team) != 5 { // 4 行版式 + 1 条流水
|
||||
t.Fatalf("第一分公司分表行数 = %d，期望 5", len(team))
|
||||
}
|
||||
teamRow := []string{"张三", "田径", "100米跑", "男子", "1", "11.58 秒", "10", "成绩"}
|
||||
for i, want := range teamRow {
|
||||
if got := cell(team, 4, i); got != want {
|
||||
t.Errorf("分表首行第 %d 列 = %q，期望 %q", i, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 跨端点一致性：明细里某人的得分之和 == 个人积分榜上那个人的总分；
|
||||
// 且折算系数只影响单位总分，个人明细必须一分不动。
|
||||
func TestAthleteDetailMatchesBoardAndIgnoresWeight(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
|
||||
assertAthleteDetailMatchesBoard(t, db)
|
||||
|
||||
if _, err := db.Exec(`UPDATE settings SET value = '0.5' WHERE key = 'standings.individual_to_team_weight'`); err != nil {
|
||||
t.Fatalf("修改折算系数: %v", err)
|
||||
}
|
||||
// 系数 0.5 下重跑：个人明细与个人积分榜仍然一致（都是原始分 10 / 8）。
|
||||
assertAthleteDetailMatchesBoard(t, db)
|
||||
|
||||
// 对照：同一份数据上单位总分被折半，证明系数确实生效，不是设置没写进去。
|
||||
board, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取总积分榜: %v", err)
|
||||
}
|
||||
for _, row := range board.Team {
|
||||
if row.TeamID == 1 && row.Points != 5 {
|
||||
t.Errorf("系数 0.5 时单位 1 总分 = %v，期望 5", row.Points)
|
||||
}
|
||||
}
|
||||
|
||||
// 单元格里必须是原始分 10，而不是折算后的 5。
|
||||
dst := filepath.Join(t.TempDir(), "个人.xlsx")
|
||||
if err := ExportAthleteDetailXLSX(db, dst, Options{}); err != nil {
|
||||
t.Fatalf("系数 0.5 下导出个人得分明细: %v", err)
|
||||
}
|
||||
f := openXLSX(t, dst)
|
||||
defer func() { _ = f.Close() }()
|
||||
rows, err := f.GetRows("第一分公司个人得分明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取分表: %v", err)
|
||||
}
|
||||
if got := cell(rows, 4, 6); got != "10" {
|
||||
t.Errorf("系数 0.5 时个人明细得分 = %q，期望 10（原始分，不折算）", got)
|
||||
}
|
||||
}
|
||||
|
||||
// 只记单位的流水不算个人得分；count_to_team = 0 的流水照样算在个人头上。
|
||||
func TestAthleteDetailLedgerScope(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
// 仅记单位（athlete_id 为空）：不进个人明细。
|
||||
insertLedger(t, db, 1, 99)
|
||||
// 「个人+团体」项目的个人通道流水：计入个人榜，但不进单位总分。
|
||||
if _, err := db.Exec(`INSERT INTO score_ledger(team_id, athlete_id, event_id, entry_id, result_id,
|
||||
source_type, source_id, points, count_to_team)
|
||||
VALUES (1, 1, 1, 1, 1, 'result', 1, 7, 0)`); err != nil {
|
||||
t.Fatalf("写入个人通道流水: %v", err)
|
||||
}
|
||||
|
||||
wb := athleteDetailWorkbook(t, db)
|
||||
if got := athletePointsFromDetail(wb, "张三"); got != 17 {
|
||||
t.Errorf("张三明细得分 = %v，期望 17（10 + 只记个人的 7）", got)
|
||||
}
|
||||
board := athletePointsFromBoard(t, db)
|
||||
if board[1] != 17 {
|
||||
t.Errorf("个人积分榜张三总分 = %v，期望 17", board[1])
|
||||
}
|
||||
for _, s := range wb.Sheets {
|
||||
for _, r := range s.Rows {
|
||||
if r.Points == 99 {
|
||||
t.Errorf("仅记单位的流水不应出现在个人明细: %+v", r)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 没有得分流水的运动员不出现在任何一张表里。
|
||||
func TestAthleteDetailSkipsAthleteWithoutLedger(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
insertAthlete(t, db, "王五", 1)
|
||||
|
||||
dst := filepath.Join(t.TempDir(), "个人.xlsx")
|
||||
if err := ExportAthleteDetailXLSX(db, dst, Options{}); err != nil {
|
||||
t.Fatalf("导出个人得分明细: %v", err)
|
||||
}
|
||||
f := openXLSX(t, dst)
|
||||
defer func() { _ = f.Close() }()
|
||||
for _, name := range f.GetSheetList() {
|
||||
rows, err := f.GetRows(name)
|
||||
if err != nil {
|
||||
t.Fatalf("读取 %s: %v", name, err)
|
||||
}
|
||||
for r := range rows {
|
||||
for c := 0; c < 9; c++ {
|
||||
if cell(rows, r, c) == "王五" {
|
||||
t.Errorf("%s 第 %d 行出现了无得分的运动员", name, r)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 一条个人流水都没有时不报错：只有总表，能重新解析。
|
||||
func TestExportAthleteDetailEmptyEvent(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
insertTeam(t, db, "T1", "第一分公司", "一公司", 1, true)
|
||||
|
||||
dst := filepath.Join(t.TempDir(), "个人.xlsx")
|
||||
if err := ExportAthleteDetailXLSX(db, dst, Options{}); err != nil {
|
||||
t.Fatalf("空赛事导出个人得分明细: %v", err)
|
||||
}
|
||||
f := openXLSX(t, dst)
|
||||
defer func() { _ = f.Close() }()
|
||||
if got := f.GetSheetList(); !equalStrings(got, []string{"个人积分总明细"}) {
|
||||
t.Fatalf("sheet 列表 = %v，期望只有总表", got)
|
||||
}
|
||||
rows, err := f.GetRows("个人积分总明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取总表: %v", err)
|
||||
}
|
||||
if len(rows) != 4 {
|
||||
t.Fatalf("总表行数 = %d，期望 4", len(rows))
|
||||
}
|
||||
if got := cell(rows, 3, 0); got != "单位" {
|
||||
t.Errorf("表头首列 = %q，期望 单位", got)
|
||||
}
|
||||
}
|
||||
|
||||
func athleteDetailWorkbook(t *testing.T, db *sql.DB) AthleteDetailWorkbook {
|
||||
t.Helper()
|
||||
wb, err := LoadAthleteDetailWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取个人得分明细: %v", err)
|
||||
}
|
||||
return wb
|
||||
}
|
||||
|
||||
// athletePointsFromBoard 是「个人积分榜」端点同源的口径：domain.BuildAthleteStandings 的总分。
|
||||
func athletePointsFromBoard(t *testing.T, db *sql.DB) map[int64]float64 {
|
||||
t.Helper()
|
||||
wb, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取个人积分榜: %v", err)
|
||||
}
|
||||
out := make(map[int64]float64, len(wb.Athlete))
|
||||
for _, row := range wb.Athlete {
|
||||
out[row.AthleteID] = row.Points
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func athletePointsFromDetail(wb AthleteDetailWorkbook, name string) float64 {
|
||||
var total float64
|
||||
for _, s := range wb.Sheets {
|
||||
for _, r := range s.Rows {
|
||||
if r.AthleteName == name {
|
||||
total += r.Points
|
||||
}
|
||||
}
|
||||
}
|
||||
return total
|
||||
}
|
||||
|
||||
// assertAthleteDetailMatchesBoard 逐人比对：明细得分之和 == 个人积分榜总分；
|
||||
// 并且两边的人必须一一对应（榜单上的人都有明细，明细里的人都在榜上）。
|
||||
func assertAthleteDetailMatchesBoard(t *testing.T, db *sql.DB) {
|
||||
t.Helper()
|
||||
wb := athleteDetailWorkbook(t, db)
|
||||
board, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取个人积分榜: %v", err)
|
||||
}
|
||||
byName := make(map[string]float64, len(board.Athlete))
|
||||
for _, row := range board.Athlete {
|
||||
byName[row.Name] = row.Points
|
||||
}
|
||||
|
||||
detailNames := make(map[string]bool)
|
||||
for _, s := range wb.Sheets {
|
||||
for _, r := range s.Rows {
|
||||
detailNames[r.AthleteName] = true
|
||||
}
|
||||
}
|
||||
for name, want := range byName {
|
||||
if !detailNames[name] {
|
||||
t.Errorf("个人积分榜上的 %q 没有明细行", name)
|
||||
continue
|
||||
}
|
||||
got := athletePointsFromDetail(wb, name)
|
||||
t.Logf("运动员 %q：明细合计 %v，个人积分榜 %v", name, got, want)
|
||||
if got != want {
|
||||
t.Errorf("运动员 %q：明细合计 %v，个人积分榜 %v", name, got, want)
|
||||
}
|
||||
}
|
||||
for name := range detailNames {
|
||||
if _, ok := byName[name]; !ok {
|
||||
t.Errorf("明细里的运动员 %q 不在个人积分榜上", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,370 @@
|
||||
package export
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"io"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/xuri/excelize/v2"
|
||||
|
||||
"git.yeij.top/AskaEth/Scoreboard/server/internal/domain"
|
||||
)
|
||||
|
||||
// medalDetailSheet 是「团体奖牌明细」总表的表名。
|
||||
const medalDetailSheet = "团体奖牌明细"
|
||||
|
||||
// 奖牌文案：与名次 1/2/3 一一对应。
|
||||
const (
|
||||
medalGold = "金牌"
|
||||
medalSilver = "银牌"
|
||||
medalBronze = "铜牌"
|
||||
)
|
||||
|
||||
// MedalDetailRow 是团体奖牌明细的一行：某单位的一块奖牌来自哪个小项/组别/名次。
|
||||
type MedalDetailRow struct {
|
||||
SportName string
|
||||
EventName string
|
||||
Category string
|
||||
Rank int
|
||||
Medal string
|
||||
Participant string
|
||||
|
||||
// 排序键，只在本包内用，不导出。
|
||||
sportSort int
|
||||
eventSort int
|
||||
catSort int
|
||||
eventID int64
|
||||
categoryID int64
|
||||
resultID int64
|
||||
}
|
||||
|
||||
// MedalDetailSheet 是某个有奖牌的单位的一张分表。
|
||||
type MedalDetailSheet struct {
|
||||
Team domain.Team
|
||||
Rows []MedalDetailRow
|
||||
}
|
||||
|
||||
// MedalDetailWorkbook 是「团体奖牌明细」的内容：一张总表 + 每个有奖牌的单位一张分表。
|
||||
type MedalDetailWorkbook struct {
|
||||
Meta Meta
|
||||
Sheets []MedalDetailSheet
|
||||
}
|
||||
|
||||
var medalDetailColumns = []column{
|
||||
{"单位", 22, kindText},
|
||||
{"大项", 14, kindText},
|
||||
{"小项", 18, kindText},
|
||||
{"组别", 14, kindText},
|
||||
{"名次", 8, kindCenter},
|
||||
{"奖牌", 8, kindCenter},
|
||||
{"运动员/队", 18, kindText},
|
||||
}
|
||||
|
||||
// medalTeamColumns 是单位分表的列：与总表一致，去掉「单位」列。
|
||||
var medalTeamColumns = medalDetailColumns[1:]
|
||||
|
||||
// ExportMedalDetailXLSX 导出团体奖牌明细，落盘到 dst。
|
||||
func ExportMedalDetailXLSX(db *sql.DB, dst string, opts Options) error {
|
||||
wb, err := LoadMedalDetailWorkbook(db, opts)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
f, err := medalDetailFile(wb)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return saveWorkbook(f, dst)
|
||||
}
|
||||
|
||||
// WriteMedalDetailXLSX 把团体奖牌明细写成 xlsx 流，供 HTTP 直接响应下载。
|
||||
func WriteMedalDetailXLSX(w io.Writer, wb MedalDetailWorkbook) error {
|
||||
f, err := medalDetailFile(wb)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return f.Write(w)
|
||||
}
|
||||
|
||||
func medalDetailFile(wb MedalDetailWorkbook) (*excelize.File, error) {
|
||||
return buildWorkbook(medalDetailSheet, func(f *excelize.File, st *styleSet) error {
|
||||
meta := wb.Meta.normalized()
|
||||
namer := &sheetNamer{}
|
||||
master := namer.add(medalDetailSheet)
|
||||
if err := addSheet(f, master); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := writeSheet(f, st, master, meta, sheetTitle(meta, medalDetailSheet),
|
||||
medalDetailColumns, medalMasterRows(wb.Sheets)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, s := range wb.Sheets {
|
||||
unit := displayName(s.Team.Name, s.Team.ShortName)
|
||||
name := namer.add(unit + "奖牌明细")
|
||||
if err := addSheet(f, name); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := writeSheet(f, st, name, meta, sheetTitle(meta, unit+" · 奖牌明细"),
|
||||
medalTeamColumns, medalTeamRows(s.Rows)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func medalMasterRows(sheets []MedalDetailSheet) [][]any {
|
||||
var out [][]any
|
||||
for _, s := range sheets {
|
||||
unit := displayName(s.Team.Name, s.Team.ShortName)
|
||||
for _, r := range s.Rows {
|
||||
out = append(out, append([]any{unit}, medalRow(r)...))
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// medalTeamRows 单位分表：逐项奖牌行 + 末尾一行小计（金/银/铜数量）。
|
||||
func medalTeamRows(rows []MedalDetailRow) [][]any {
|
||||
out := make([][]any, 0, len(rows)+1)
|
||||
var gold, silver, bronze int
|
||||
for _, r := range rows {
|
||||
switch r.Medal {
|
||||
case medalGold:
|
||||
gold++
|
||||
case medalSilver:
|
||||
silver++
|
||||
case medalBronze:
|
||||
bronze++
|
||||
}
|
||||
out = append(out, medalRow(r))
|
||||
}
|
||||
// 没有奖牌的单位不会进 Sheets，这里的合计行必然跟着数据行；列序 大项/小项/组别/名次/奖牌/运动员-队。
|
||||
return append(out, []any{"小计", "", "", "", fmt.Sprintf("金 %d / 银 %d / 铜 %d", gold, silver, bronze), ""})
|
||||
}
|
||||
|
||||
func medalRow(r MedalDetailRow) []any {
|
||||
rank := ""
|
||||
if r.Rank > 0 {
|
||||
rank = strconv.Itoa(r.Rank)
|
||||
}
|
||||
return []any{r.SportName, r.EventName, r.Category, rank, r.Medal, r.Participant}
|
||||
}
|
||||
|
||||
// LoadMedalDetailWorkbook 读取全部奖牌来源。
|
||||
// 单位顺序沿用「团体奖牌榜」（与单位总分榜同序），没有奖牌的单位不出分表。
|
||||
func LoadMedalDetailWorkbook(db *sql.DB, opts Options) (MedalDetailWorkbook, error) {
|
||||
if db == nil {
|
||||
return MedalDetailWorkbook{}, ErrNoDatabase
|
||||
}
|
||||
meta, settings, err := resolveMeta(db, opts.Meta)
|
||||
if err != nil {
|
||||
return MedalDetailWorkbook{}, err
|
||||
}
|
||||
// 名次输入与榜单同源：loadRanked 只取已发布、有效、计分小项的名次。
|
||||
ranked, err := loadRanked(db)
|
||||
if err != nil {
|
||||
return MedalDetailWorkbook{}, err
|
||||
}
|
||||
excludeTeam := strings.EqualFold(strings.TrimSpace(settings["standings.medal_counts_team_events"]), "false")
|
||||
hits := medalHits(ranked, excludeTeam)
|
||||
ctx, err := loadMedalContext(db)
|
||||
if err != nil {
|
||||
return MedalDetailWorkbook{}, err
|
||||
}
|
||||
teams, err := loadTeams(db, false)
|
||||
if err != nil {
|
||||
return MedalDetailWorkbook{}, err
|
||||
}
|
||||
order, err := teamStandingsOrder(db, opts)
|
||||
if err != nil {
|
||||
return MedalDetailWorkbook{}, err
|
||||
}
|
||||
orderTeamsByStandings(teams, order)
|
||||
|
||||
sheets := make([]MedalDetailSheet, 0, len(teams))
|
||||
for _, t := range teams {
|
||||
rows := medalRowsOfTeam(t.ID, hits, ctx)
|
||||
if len(rows) == 0 {
|
||||
continue
|
||||
}
|
||||
sheets = append(sheets, MedalDetailSheet{Team: t, Rows: rows})
|
||||
}
|
||||
return MedalDetailWorkbook{Meta: meta, Sheets: sheets}, nil
|
||||
}
|
||||
|
||||
// medalHit 是一枚奖牌：来自哪条成绩、什么名次、什么牌。
|
||||
type medalHit struct {
|
||||
resultID int64
|
||||
rank int
|
||||
medal string
|
||||
}
|
||||
|
||||
// medalHits 逐「报名项」判定获奖单位。
|
||||
//
|
||||
// 同一报名项在多条计分通道下会展开成多条名次，只能记一枚奖牌——选通道、联队份额展开、
|
||||
// 名次换牌色这些规则都交给 domain 的团体奖牌榜函数（domain.BuildMedalStandings）判定，
|
||||
// 导出侧不复制计奖规则。传入的单位/流水/运动员都为空，返回的行只可能来自该报名项的奖牌。
|
||||
func medalHits(ranked []domain.RankedResult, excludeTeam bool) map[int64][]medalHit {
|
||||
out := make(map[int64][]medalHit)
|
||||
for _, group := range medalGroups(ranked) {
|
||||
if len(group) == 0 {
|
||||
continue
|
||||
}
|
||||
rows := domain.BuildMedalStandings(domain.StandingsInput{
|
||||
Ranked: group,
|
||||
ExcludeTeamEventMedals: excludeTeam,
|
||||
})
|
||||
rr := group[0]
|
||||
for _, row := range rows {
|
||||
for i := 0; i < row.Gold; i++ {
|
||||
out[row.TeamID] = append(out[row.TeamID], medalHit{rr.ResultID, 1, medalGold})
|
||||
}
|
||||
for i := 0; i < row.Silver; i++ {
|
||||
out[row.TeamID] = append(out[row.TeamID], medalHit{rr.ResultID, 2, medalSilver})
|
||||
}
|
||||
for i := 0; i < row.Bronze; i++ {
|
||||
out[row.TeamID] = append(out[row.TeamID], medalHit{rr.ResultID, 3, medalBronze})
|
||||
}
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// medalGroupKey 与 domain 的奖牌去重键同构：同一小项、同一组别的同一报名项只记一枚奖牌。
|
||||
// 聚合通道不对应单条报名项（entryID = 0）时退回「名次主体」，仍无法识别主体时每条自成一枚。
|
||||
type medalGroupKey struct {
|
||||
eventID int64
|
||||
categoryID int64
|
||||
entryID int64
|
||||
scope domain.Scope
|
||||
subject int64
|
||||
unique int
|
||||
}
|
||||
|
||||
func medalGroups(ranked []domain.RankedResult) [][]domain.RankedResult {
|
||||
index := make(map[medalGroupKey]int, len(ranked))
|
||||
var groups [][]domain.RankedResult
|
||||
degenerate := 0
|
||||
for _, rr := range ranked {
|
||||
k := medalGroupKey{eventID: rr.EventID, categoryID: rr.CategoryID, entryID: rr.EntryID}
|
||||
if k.entryID == 0 {
|
||||
k.scope = rr.Scope
|
||||
if rr.Scope == domain.ScopeAthlete {
|
||||
k.subject = rr.AthleteID
|
||||
} else {
|
||||
k.subject = rr.TeamID
|
||||
}
|
||||
if k.subject == 0 {
|
||||
degenerate++
|
||||
k.unique = degenerate
|
||||
}
|
||||
}
|
||||
i, ok := index[k]
|
||||
if !ok {
|
||||
i = len(groups)
|
||||
index[k] = i
|
||||
groups = append(groups, nil)
|
||||
}
|
||||
groups[i] = append(groups[i], rr)
|
||||
}
|
||||
return groups
|
||||
}
|
||||
|
||||
// medalContext 是一条成绩的展示字段与排序键。
|
||||
type medalContext struct {
|
||||
sportName string
|
||||
eventName string
|
||||
category string
|
||||
participant string
|
||||
sportSort int
|
||||
eventSort int
|
||||
catSort int
|
||||
eventID int64
|
||||
categoryID int64
|
||||
}
|
||||
|
||||
func loadMedalContext(db *sql.DB) (map[int64]medalContext, error) {
|
||||
rows, err := db.Query(`
|
||||
SELECT r.id, COALESCE(s.name, ''), e.name, COALESCE(c.name, ''),
|
||||
COALESCE(a.name, ''), COALESCE(en.member_names, ''),
|
||||
COALESCE(s.sort_order, 0), e.sort_order, COALESCE(c.sort_order, 0),
|
||||
e.id, COALESCE(c.id, 0)
|
||||
FROM results r
|
||||
JOIN entries en ON en.id = r.entry_id
|
||||
JOIN events e ON e.id = r.event_id
|
||||
LEFT JOIN sports s ON s.id = e.sport_id
|
||||
LEFT JOIN event_categories c ON c.id = en.category_id
|
||||
LEFT JOIN athletes a ON a.id = en.athlete_id`)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("export: 读取奖牌来源: %w", err)
|
||||
}
|
||||
defer func() { _ = rows.Close() }()
|
||||
|
||||
out := make(map[int64]medalContext)
|
||||
for rows.Next() {
|
||||
var (
|
||||
resultID int64
|
||||
athleteName string
|
||||
memberJSON string
|
||||
c medalContext
|
||||
)
|
||||
if err := rows.Scan(&resultID, &c.sportName, &c.eventName, &c.category,
|
||||
&athleteName, &memberJSON, &c.sportSort, &c.eventSort, &c.catSort,
|
||||
&c.eventID, &c.categoryID); err != nil {
|
||||
return nil, fmt.Errorf("export: 扫描奖牌来源: %w", err)
|
||||
}
|
||||
c.participant = participantName(athleteName, memberJSON)
|
||||
out[resultID] = c
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("export: 遍历奖牌来源: %w", err)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// medalRowsOfTeam 把某单位的奖牌拼成展示行，按大项/小项/组别/名次的既有顺序排列。
|
||||
func medalRowsOfTeam(teamID int64, hits map[int64][]medalHit, ctx map[int64]medalContext) []MedalDetailRow {
|
||||
list := hits[teamID]
|
||||
rows := make([]MedalDetailRow, 0, len(list))
|
||||
for _, h := range list {
|
||||
c := ctx[h.resultID]
|
||||
rows = append(rows, MedalDetailRow{
|
||||
SportName: c.sportName,
|
||||
EventName: c.eventName,
|
||||
Category: c.category,
|
||||
Rank: h.rank,
|
||||
Medal: h.medal,
|
||||
Participant: c.participant,
|
||||
sportSort: c.sportSort,
|
||||
eventSort: c.eventSort,
|
||||
catSort: c.catSort,
|
||||
eventID: c.eventID,
|
||||
categoryID: c.categoryID,
|
||||
resultID: h.resultID,
|
||||
})
|
||||
}
|
||||
sort.SliceStable(rows, func(i, j int) bool {
|
||||
a, b := rows[i], rows[j]
|
||||
switch {
|
||||
case a.sportSort != b.sportSort:
|
||||
return a.sportSort < b.sportSort
|
||||
case a.eventSort != b.eventSort:
|
||||
return a.eventSort < b.eventSort
|
||||
case a.eventID != b.eventID:
|
||||
return a.eventID < b.eventID
|
||||
case a.catSort != b.catSort:
|
||||
return a.catSort < b.catSort
|
||||
case a.categoryID != b.categoryID:
|
||||
return a.categoryID < b.categoryID
|
||||
case a.Rank != b.Rank:
|
||||
return a.Rank < b.Rank
|
||||
default:
|
||||
return a.resultID < b.resultID
|
||||
}
|
||||
})
|
||||
return rows
|
||||
}
|
||||
@@ -0,0 +1,242 @@
|
||||
package export
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// addBronzeEntry 给 seedEvent 的小项补一条第 3 名，让一块金牌之外还有银、铜。
|
||||
func addBronzeEntry(t *testing.T, db *sql.DB) {
|
||||
t.Helper()
|
||||
// entries 对（组别，单位，运动员）唯一，第 3 名要再派一名运动员。
|
||||
stmts := []string{
|
||||
`INSERT INTO athletes(name, gender, team_id) VALUES ('王六', '男', 2)`,
|
||||
`INSERT INTO entries(event_id, category_id, team_id, athlete_id, bib) VALUES (1, 1, 2, 3, '103')`,
|
||||
`INSERT INTO results(event_id, entry_id, rank, result_text, result_value, unit, state)
|
||||
VALUES (1, 3, 3, '12.10', 12.10, 's', 'published')`,
|
||||
}
|
||||
for _, s := range stmts {
|
||||
if _, err := db.Exec(s); err != nil {
|
||||
t.Fatalf("造数据 %q: %v", s, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 团体奖牌明细：总表逐块列出，每个有奖牌的单位一张分表，分表末尾一行小计。
|
||||
func TestExportMedalDetailXLSX(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db) // T1 第 1 名、T2 第 2 名
|
||||
addBronzeEntry(t, db)
|
||||
|
||||
dst := filepath.Join(t.TempDir(), "奖牌.xlsx")
|
||||
if err := ExportMedalDetailXLSX(db, dst, Options{}); err != nil {
|
||||
t.Fatalf("导出团体奖牌明细: %v", err)
|
||||
}
|
||||
f := openXLSX(t, dst)
|
||||
defer func() { _ = f.Close() }()
|
||||
|
||||
want := []string{"团体奖牌明细", "第一分公司奖牌明细", "第二分公司奖牌明细"}
|
||||
if got := f.GetSheetList(); !equalStrings(got, want) {
|
||||
t.Fatalf("sheet 列表 = %v，期望 %v", got, want)
|
||||
}
|
||||
|
||||
master, err := f.GetRows("团体奖牌明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取总表: %v", err)
|
||||
}
|
||||
// 4 行版式 + 3 块奖牌
|
||||
if len(master) != 7 {
|
||||
t.Fatalf("总表行数 = %d，期望 7", len(master))
|
||||
}
|
||||
header := []string{"单位", "大项", "小项", "组别", "名次", "奖牌", "运动员/队"}
|
||||
for i, want := range header {
|
||||
if got := cell(master, 3, i); got != want {
|
||||
t.Errorf("表头第 %d 列 = %q，期望 %q", i, got, want)
|
||||
}
|
||||
}
|
||||
first := []string{"第一分公司", "田径", "100米跑", "男子", "1", "金牌", "张三"}
|
||||
for i, want := range first {
|
||||
if got := cell(master, 4, i); got != want {
|
||||
t.Errorf("首行第 %d 列 = %q，期望 %q", i, got, want)
|
||||
}
|
||||
}
|
||||
if got := cell(master, 5, 5); got != "银牌" {
|
||||
t.Errorf("第二行奖牌 = %q，期望 银牌", got)
|
||||
}
|
||||
if got := cell(master, 6, 5); got != "铜牌" {
|
||||
t.Errorf("第三行奖牌 = %q，期望 铜牌", got)
|
||||
}
|
||||
if got := cell(master, 6, 0); got != "第二分公司" {
|
||||
t.Errorf("第三行单位 = %q，期望 第二分公司", got)
|
||||
}
|
||||
|
||||
// 分表列 = 总表去掉「单位」列 + 末尾小计。
|
||||
gold, err := f.GetRows("第一分公司奖牌明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取金牌单位分表: %v", err)
|
||||
}
|
||||
if len(gold) != 6 { // 4 行版式 + 1 块奖牌 + 小计
|
||||
t.Fatalf("第一分公司分表行数 = %d，期望 6", len(gold))
|
||||
}
|
||||
if got := cell(gold, 3, 0); got != "大项" {
|
||||
t.Errorf("分表表头首列 = %q，期望 大项", got)
|
||||
}
|
||||
if got := cell(gold, 4, 5); got != "张三" {
|
||||
t.Errorf("分表首行运动员 = %q，期望 张三", got)
|
||||
}
|
||||
if got := cell(gold, 5, 0); got != "小计" {
|
||||
t.Errorf("分表小计行首列 = %q，期望 小计", got)
|
||||
}
|
||||
if got := cell(gold, 5, 4); got != "金 1 / 银 0 / 铜 0" {
|
||||
t.Errorf("分表小计 = %q，期望 金 1 / 银 0 / 铜 0", got)
|
||||
}
|
||||
|
||||
silver, err := f.GetRows("第二分公司奖牌明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取银铜单位分表: %v", err)
|
||||
}
|
||||
if len(silver) != 7 { // 4 行版式 + 银、铜各 1 块 + 小计
|
||||
t.Fatalf("第二分公司分表行数 = %d，期望 7", len(silver))
|
||||
}
|
||||
if got := cell(silver, 6, 4); got != "金 0 / 银 1 / 铜 1" {
|
||||
t.Errorf("分表小计 = %q，期望 金 0 / 银 1 / 铜 1", got)
|
||||
}
|
||||
}
|
||||
|
||||
// 奖牌明细必须与团体奖牌榜逐单位对得上，包括「个人+团体」双计项目只记一枚奖牌。
|
||||
func TestMedalDetailMatchesBoard(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
addBronzeEntry(t, db)
|
||||
// 再造一个双计项目：同一条成绩在 athlete + team 两条通道下各产出一条名次。
|
||||
stmts := []string{
|
||||
`INSERT INTO events(sport_id, code, name, event_type, result_mode, result_type, compare, status)
|
||||
VALUES (1, 'E2', '100米跑（双计）', 'individual_team', 'auto', 'time', 'asc', 'published')`,
|
||||
`INSERT INTO event_categories(event_id, name, sort_order) VALUES (2, '男子', 1)`,
|
||||
`INSERT INTO event_score_channels(event_id, scope, basis, profile_id)
|
||||
SELECT 2, 'athlete', 'result', id FROM scoring_profiles WHERE code = 'individual_top6'`,
|
||||
`INSERT INTO event_score_channels(event_id, scope, basis, profile_id)
|
||||
SELECT 2, 'team', 'result', id FROM scoring_profiles WHERE code = 'team_top6'`,
|
||||
`INSERT INTO entries(event_id, category_id, team_id, athlete_id, bib) VALUES (2, 2, 1, 1, '301')`,
|
||||
`INSERT INTO results(event_id, entry_id, rank, result_text, result_value, unit, state)
|
||||
SELECT 2, id, 1, '11.00', 11.00, 's', 'published' FROM entries WHERE event_id = 2`,
|
||||
}
|
||||
for _, s := range stmts {
|
||||
if _, err := db.Exec(s); err != nil {
|
||||
t.Fatalf("造数据 %q: %v", s, err)
|
||||
}
|
||||
}
|
||||
|
||||
wb, err := LoadMedalDetailWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取奖牌明细: %v", err)
|
||||
}
|
||||
board, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取团体奖牌榜: %v", err)
|
||||
}
|
||||
|
||||
// 双计项目只贡献一枚金牌（去重成一条），不是两条。
|
||||
dual := 0
|
||||
total := 0
|
||||
for _, s := range wb.Sheets {
|
||||
for _, r := range s.Rows {
|
||||
total++
|
||||
if r.EventName == "100米跑（双计）" {
|
||||
dual++
|
||||
}
|
||||
}
|
||||
}
|
||||
if dual != 1 {
|
||||
t.Errorf("双计项目奖牌明细行数 = %d，期望 1（同一报名项只记一枚）", dual)
|
||||
}
|
||||
if total != 4 { // 3 块单通道奖牌 + 1 块双计奖牌
|
||||
t.Errorf("奖牌明细总行数 = %d，期望 4", total)
|
||||
}
|
||||
|
||||
for i, row := range board.Medal {
|
||||
gold, silver, bronze := medalCountsOf(wb, row.TeamID)
|
||||
t.Logf("单位 %d：明细 金%d/银%d/铜%d，榜单 金%d/银%d/铜%d", row.TeamID, gold, silver, bronze, row.Gold, row.Silver, row.Bronze)
|
||||
if gold != row.Gold || silver != row.Silver || bronze != row.Bronze {
|
||||
t.Errorf("单位 %d 奖牌明细 金%d/银%d/铜%d，榜单 金%d/银%d/铜%d（榜第 %d 名）",
|
||||
row.TeamID, gold, silver, bronze, row.Gold, row.Silver, row.Bronze, i+1)
|
||||
}
|
||||
if gold+silver+bronze == 0 {
|
||||
// 榜上有名字但没有奖牌的单位不应出现在明细里。
|
||||
for _, s := range wb.Sheets {
|
||||
if s.Team.ID == row.TeamID {
|
||||
t.Errorf("无奖牌单位 %d 不应出分表", row.TeamID)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 没有奖牌（甚至没有小项）时不报错，返回只有表头的总表。
|
||||
func TestExportMedalDetailEmptyEvent(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
insertTeam(t, db, "T1", "第一分公司", "一公司", 1, true)
|
||||
|
||||
dst := filepath.Join(t.TempDir(), "奖牌.xlsx")
|
||||
if err := ExportMedalDetailXLSX(db, dst, Options{}); err != nil {
|
||||
t.Fatalf("无奖牌导出: %v", err)
|
||||
}
|
||||
f := openXLSX(t, dst)
|
||||
defer func() { _ = f.Close() }()
|
||||
|
||||
if got := f.GetSheetList(); !equalStrings(got, []string{"团体奖牌明细"}) {
|
||||
t.Fatalf("sheet 列表 = %v，期望只有总表", got)
|
||||
}
|
||||
rows, err := f.GetRows("团体奖牌明细")
|
||||
if err != nil {
|
||||
t.Fatalf("读取总表: %v", err)
|
||||
}
|
||||
if len(rows) != 4 { // 标题 / 副标题 / 空行 / 表头
|
||||
t.Fatalf("总表行数 = %d，期望 4", len(rows))
|
||||
}
|
||||
if got := cell(rows, 3, 0); got != "单位" {
|
||||
t.Errorf("表头首列 = %q，期望 单位", got)
|
||||
}
|
||||
}
|
||||
|
||||
// 已隐藏但有奖牌的单位在榜上，导出要与榜单一致地保留它。
|
||||
func TestMedalDetailKeepsHiddenTeamWithMedals(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
silent := insertTeam(t, db, "H2", "被隐藏且无牌", "隐藏二", 4, false)
|
||||
hideTeam(t, db, silent)
|
||||
|
||||
wb, err := LoadMedalDetailWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取奖牌明细: %v", err)
|
||||
}
|
||||
for _, s := range wb.Sheets {
|
||||
if s.Team.ID == silent {
|
||||
t.Fatalf("无奖牌的隐藏单位不应出分表: %+v", s.Team)
|
||||
}
|
||||
}
|
||||
if len(wb.Sheets) != 2 {
|
||||
t.Fatalf("分表数 = %d，期望 2（T1 金、T2 银）", len(wb.Sheets))
|
||||
}
|
||||
}
|
||||
|
||||
func medalCountsOf(wb MedalDetailWorkbook, teamID int64) (int, int, int) {
|
||||
var gold, silver, bronze int
|
||||
for _, s := range wb.Sheets {
|
||||
if s.Team.ID != teamID {
|
||||
continue
|
||||
}
|
||||
for _, r := range s.Rows {
|
||||
switch r.Medal {
|
||||
case medalGold:
|
||||
gold++
|
||||
case medalSilver:
|
||||
silver++
|
||||
case medalBronze:
|
||||
bronze++
|
||||
}
|
||||
}
|
||||
}
|
||||
return gold, silver, bronze
|
||||
}
|
||||
@@ -123,18 +123,7 @@ func LoadAllTeamDetailsWorkbook(db *sql.DB, opts Options) (AllTeamDetailsWorkboo
|
||||
if err != nil {
|
||||
return AllTeamDetailsWorkbook{}, err
|
||||
}
|
||||
sort.SliceStable(teams, func(i, j int) bool {
|
||||
oi, iok := order[teams[i].ID]
|
||||
oj, jok := order[teams[j].ID]
|
||||
if iok != jok {
|
||||
return iok
|
||||
}
|
||||
if iok {
|
||||
return oi < oj
|
||||
}
|
||||
// 都不在榜上时保持 loadTeams 的 sort_order, code 顺序。
|
||||
return false
|
||||
})
|
||||
orderTeamsByStandings(teams, order)
|
||||
|
||||
sheets := make([]TeamDetailSheet, 0, len(teams))
|
||||
for _, t := range teams {
|
||||
@@ -171,3 +160,19 @@ func teamStandingsOrder(db *sql.DB, opts Options) (map[int64]int, error) {
|
||||
}
|
||||
return order, nil
|
||||
}
|
||||
|
||||
// orderTeamsByStandings 把单位按「单位总分榜」顺序（得分高的在前）原地排序；
|
||||
// 榜上没有的单位保持 loadTeams 的 sort_order, code 顺序，排在榜上有名的单位之后。
|
||||
func orderTeamsByStandings(teams []domain.Team, order map[int64]int) {
|
||||
sort.SliceStable(teams, func(i, j int) bool {
|
||||
oi, iok := order[teams[i].ID]
|
||||
oj, jok := order[teams[j].ID]
|
||||
if iok != jok {
|
||||
return iok
|
||||
}
|
||||
if iok {
|
||||
return oi < oj
|
||||
}
|
||||
return false
|
||||
})
|
||||
}
|
||||
Reference in new issue
Block a user