From 1d5ac896ddca13439169fda0dc6d62f33f7a87e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= <hongjianli_email@126.com>
Date: Sun, 28 Dec 2025 16:09:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=B7=B2=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=88=90=E7=BB=A9=E5=88=97=E8=A1=A8API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 /mini/general/confirmed 接口
- MartialResultServiceImpl 添加 getConfirmedGeneralList 方法
- 支持总裁页面同时显示待确认和已确认成绩

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 .../buckets/.bloomcycle.bin/xl.meta           | Bin 743 -> 743 bytes
 .../buckets/.usage-cache.bin.bkp/xl.meta      | Bin 627 -> 637 bytes
 .../buckets/.usage-cache.bin/xl.meta          | Bin 627 -> 637 bytes
 .../.minio.sys/buckets/.usage.json/xl.meta    | Bin 2358 -> 2358 bytes
 .../.usage-cache.bin.bkp/xl.meta              | Bin 626 -> 626 bytes
 .../000000-assets/.usage-cache.bin/xl.meta    | Bin 626 -> 626 bytes
 .../assets/.usage-cache.bin.bkp/xl.meta       | Bin 575 -> 575 bytes
 .../buckets/assets/.usage-cache.bin/xl.meta   | Bin 575 -> 575 bytes
 .../controller/MartialMiniController.java     |  10 +++++++
 .../service/IMartialResultService.java        |   6 ++++
 .../impl/MartialResultServiceImpl.java        |  27 ++++++++++++++++++
 11 files changed, 43 insertions(+)

diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta
index 55e03433a309090d08015c24a2796b8beb2835c7..5f7a757a31aee5c57c4002ffb86f6a796fc13053 100644
GIT binary patch
delta 447
zcmaFP`kZxwI&W*x=I&48`;V}6$lhq5Xksj|DIn@yNv+$W85g(K{3-nWcVc-RJ5<rc
zKQ;=6W|oPji6%)Fsm7@$h6YB7#+K$LsY%93sg_BGY39k3BN+AS>-}c0W^7!NSDKS^
zlri|}j(-R9_!PGZeNmX}YJ4|!{>6Zr$p>5>p1AB5vrBB+#RMJ(FlbqxTv}9=npeWG
zBrmn1<Sb9Z^5T-jqLS2<<2<Y&6`27~*PBXNzFn7GnVggAoS$2elM0l*!yo`x@JQSA
zmu3AE1V7zOV)G;fcd_ZOk`@H_zUj9zVL11(w3%SeO$0aGO!4?$1b4ETFVk!U_q>_W
z`%XCb3Ab6godblM40P!eceAc{)(Gilt7ZmG1b4q#bj3Ra_qSQU!3sF{skxbNfG2`m
QY*w0TfZ(n-%b)cW0B=d3Z~y=R

delta 447
zcmaFP`kZxwI&aHYiys1a8IG`sbrmg}XkskTZXd-ZG082o@&1cl6HH2UCzjW-LlsT@
zW20bdYGi6^W|C@Yo@Q)mXlZI;X<=z-YGiC|k!qS`l43SFf>E!&P-TG<W8;#%(wv;5
zjKRCD_ZyVRIu>2N5U5b?R@KR0=A?4kBco);^nD82OrLDlvoe4|%kt#XqN3Ei5{4yt
zsTCz>S=TQwE=epZNliJ<16GphA7W$_KFNPwa%FN(s&jsBK~5@A_6~ypTtUD(W6KBi
z_6YtfV>KrcI5$wuSTOuBf}3P)(D?(woo5`w&4l3IGL}4%2ImHe8Am2nA-F-tA^&C|
zxP8X$$zBj{GDD_+&?)0RzVUGBU^e5dRlEqUlld&!%?NItamh)9(ZRcnC-e0qWWO1|
PU;YHn4KXtAc`E?`LidV#

diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta
index 23e878873a0018c547386ed5b5927f8f7860fc57..25f057662106a4b93d0142c73c3c53ddc2e2e75d 100644
GIT binary patch
delta 367
zcmey&@|R_TI&W*x=I)Ed=Z>&6xCT9+XkskDzl`ZjO@e#&!rny_q`z%jGO;{P{nV;}
z#G(?%;LNJj;)xd-PAvhkfb>$|kj&iF%MwsSCjK#1Uy@pqn0`~i)F9Es$Rstz&?v<;
zCB-l?H7PB{JS{Cb$;8meFxez+vLU0I^TM)o=}D&<&K>zsTF2P9B(F3l=g6yRqH|?)
zN)5hB6?#wbs+X<faR_hDU$Tt-`npX!RXLAjaA<7R|Leja%5asHfrV@GK}N}Xp7>Qh
ziNz(M1u2OosmFO(8Gs-&;OTlZt#98~2WMv%c%&xgWagzGTI!sboRQkR)&LB26N`&e
zONu)dC1*@nR9tn5Vdh-rMft_ti^_@_7N_I_iQ=l_*$fO!%*+hTATt-0WlZM=F&G#Y
zCLda;57Iel*&>zVDh8lF1_n-sO4ADl{F{mxzBKUeVenJfmy{sp!I!}?>z5z^qoj|2

delta 356
zcmey%@|k6VI&aHYi|_Bnw2rWB5bkcAXksj|C^n+PLeA4>H|N?^rNi8tCYHykA6ONT
zSXAN|oLQAxJn<sKfh8aokY4H=l9`)&SpsUv#6PB!BN)}PmZX*>rr%VsFilOfG)YQI
zG)YV|GEPo3H%T-$Ge|bDuuMrxHZ@6FSavQw=`_Q+n*z!A7#o-5mFDCed2p1IJ=90;
z^?!p0_8IdxK4&TQnYo~D&0ZD>&0by+GtD3ljjj5BT^K|eT3H!FI42)ul&oi6x5_86
zxFob7C9x#+I1eiW5M=s?7#VxA-(MY^omt?KnwXQBmwsreb7FEvYV)$h;^Nej;*Leh
z850&2S1~NgFJ@R&R?M(CB^O8(R~63&nXsrVV>-ja<U?x>z(DsB!_2wLK&9MF%*+hT
p+za(V`X_NR1W4&P9W!EJ&2)%YC=oiL+2o@;<DPLko1$y!A^?}^hs6K@

diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta
index 7e1825f6f53c3c0c16b09b35a2af318a8fcfe01d..49ab5c7ccf28382731402a71f01148cd299a7e8b 100644
GIT binary patch
delta 352
zcmey&@|R_TI&W*x=I#v=sYh7;8b&{vXksj2<H%bZQ{}4H{w{@EoYi2@#PT@xQ>y|J
zi%J}WGpkaICthSYwFJZh(o20qGILWeOF#{o_{T=U)F9Es$Rstz&?v<;CB-l?H7PB{
zJS{Cb$;8meFxez+as;EEb?LwLlNlSA<dx>+9C<ZObgpbpslivNLhlJ)^|Ez54&lxD
zOO~-;U$<$eD(8_54vnq)e_a?v8LqN2uy9R2$S7IQ6TiwQvA86(ASJOR^*9eJ0}x~e
zJY8?5_3iuW;Oxu-kJQAR%)InNOPv#wGg6z^8i0XrVsUY5NpZ)b<ctZ6imNU$%$%#d
zD8HC{QCTs=;*?w<QCw9#n}LCenVEqZWagr>jOpAU1_Q&w<U<SfK{_WbTclE4#Q@aD
jz`)5+X?nqce^U{|mj>QF41Nmxk`lx`_%b+V{SpKK+|7hE

delta 342
zcmey%@|k6VI&aHYi|^;NZXRKoRUDu<(ZpEbyqTVA@(MSV$qnc0e+C#iPb`m9Kd>qw
zv8co`II}9Xc;ZEd14}?GAidN#Br`YlvINwSiGOSqEKF0=EKQP<5=|1*jEs{L%}o-G
z%?y$aEG$!!l1)vLCPy&pSqtPHeZ|<gB(F3l=g5Pjoa~`Ka<BgzJh0E0zwtRssn5&>
zb!+yrNND!*ikN8zacFGS|Leja%FxQn5W+e6AfseG>$+7wiNz(M1u2OosmFO(8Gs<u
zKg7t`ll}hc;Oxu-kJQAR%)InNOPv#wGg6zEB^DQ_mK1j^O3s+DsJMz@QGPMQqOxL!
z#VNT!qPVJfHpqlUWf{{M7A7BBYXAniml$TwRR${MW@2V$VCG(^57Ix0lOaG#$LW|6
b18b&3yh4f43C$)S-5K|c)7cbVOBVqE#gBrI

diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta
index 0b424047235a1340e4a8ffd08ea506de8a854505..c515d8977b51d23d636155ca790b9550e1957fb2 100644
GIT binary patch
delta 181
zcmdlcv`uJ&I&W*x=I$>}yN|FeI=Mb=qKUD<hlZ}bnai9c=0@Ltes0d+XA{fo*rAFh
z{xO{#!6+BIB()?l{icG6MRIboiMfHPL9)3;s-=07L2_bpT9SoDvQesKQkvz$vUBN4
zry0&2I&L|Iv2jUWX->{j_EnNaPF(Rax0gG_R(jpN^{maxN{zwPiP4dfw_#;rdWhuY
hHH;F%79j=}RtA<<hL(Dk1{UTPrpA_=uQSH80{}S0N5KF9

delta 182
zcmdlcv`uJ&I&aHYiytCMZ;!C(z2aCg(ZpDw@k9F>KOuj~SvfQ2?zqb`XJUCBJ5<rc
zKc?zSQcDukZz`Brrdb#m8yJ`v7$%un8e1f$8KjyUnI!_*W)?{n#*+;h<;)hAol8$T
z&2X-<>0Se4<C476oSdWVtAd)|o{im5@M_23lOBQ+S9mrAyjaS*>)cu8Ao0EW(;VMT
hUc)FMY#w4@Y-Ma_WoV&iVP;@rWMXK#`8s1fI{*S}NXY;I

diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta
index cc7850a57baae416faff148b3d5012c4f17733c2..bcda27254d5271e830c0c92d7850b7fb729a8874 100644
GIT binary patch
delta 192
zcmeyw@`+`FI&W*x=5DS>JV#inwoh9;(ZpDwN!L1SLXVT_V$H+39s7?To>*ST4plVq
zkLlzHMzxqFsU?Z&Hx(?+QVmTllMPLbEG<n^%?uL_O;St^jg2iWlg*Qjl1&ztol8$T
z&2TQ+a<@2R<C476oSY-~i*+PcFIy)qsdGW{%9~F*R|MKp-)vB85avDjv|sOK<h9A0
r84YE4;#c`37MFw;q$HN49_L|Y0D{bbr|V7q&T>p*%45mtW|0N}Jwr>p

delta 193
zcmeyw@`+`FI&aHYi|_WYJ&&;Xajy26Xksi-@3i2prK!*NseyZ1`y3v&PAsouhbo%*
z$5eeuYDr@HO$B3Pqf`@fV<QvG<djrP3yUOUvosSUgQV2NWRui1bEC<IjB2I}%g&`I
zon|;UO(9=^v2jUWX->|O`%@Mlicd;gF{S3W&=c)<OdFRyu*i>JdQefwrd#+@hveMJ
sn;8vdSl6xcNh~f2El5c$Nj=WP$^ZnJ{vk$2UA&o-nDSU2uWLRB0Jv;UxBvhE

diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta
index 40d9b945e57b62865e61ace1b05057c83068ad1a..91be04a1eb1a83ffd079f2c337b175e8d103e073 100644
GIT binary patch
delta 178
zcmeyw@`+`FI&W*x=B}$1yhm76t-KyhG%*&qe)oG6+gFFZO@7MK&%aujPb{xvhbo%*
z$40@@EY;A|GTG3?$kNgz)yy!_&?Lpw(Ae10GTA)YDA{Ck1f!m=M{-IUW8;#%(wv+l
z_ltETRxev8Eva)s^2(b}I#&eRQr~P)YY^r=__SZ|W#qNVn;8vdc;Z+2Bo>#17NjJW
cq#oyCWdMTAfT!zC{mybsV#;I5>1L4z0Kv>e!vFvP

delta 178
zcmeyw@`+`FI&aHYi|>N0Do0o}C!d`+(ZpC_#^y7Dm7l%!_V0W6b?(9+lO~qeu|pM2
z{9~hFY;2TjVs30?Vws$hYH4ASWNemZVq}n%nwV^onr3b^If7A7cipBV*BKj^<dx>+
z9JxPb@uB#nv=vioehWR(e#f+N*#nFG_@xIGg>1ToFLg-HoxGXRP=<BgDxbvSlF)*b
d#FEtGJgf{rkm(;{WYoo*If*Hc<?*`aa{!ngNtFNq

diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta
index cbf8d4aae58156246d03ec2277a4588ce46a795e..033c60ec3e90e41794274fbb6f140a3dc589643e 100644
GIT binary patch
delta 193
zcmdnbvY%ywI&W*x=I*X-bC0kr367VWXkskT-}~7}x5eMS{o{)o{=DAJ6U*z^p^7H{
zF`XR2s1~y%wInh9rh<{NX`)$bie;KbnuT$Sk$G~Wk)frjg{g&kQevWEYVyLebLmN^
z8P4Uke-dJBT#{FslXGNEz}o8)MF-AXn)nIti1Jgjh>G~*=c*B3HRbrj#VXyebS7_R
r)RN(eU*(fnToPK4l30>@oQIVG2r>hnt~b4<T0Z$FqZ7-ija)wfR|`)q

delta 194
zcmdnbvY%ywI&aHYi|=b~uN-0de%ImML=$5H)icE_P1PI~_DwtV-k@NK_{8!$cBrC>
ze@xYvq?RP6-&8O&F*Y+!Ha1C3PBJjINJ>nyG&V{zH#e|IOEoYtFif3n$f#zzu<TrV
z(rJcsx6b~}U~F8HSDKS^WX;@|_i8-OOF4u0*G;*_+8A+fit~xhe>7Ih@ZR0*x>(D5
t@@7UY8P;{Hd=iUGLJLw7OHz;XurdHarhkZ$F+0D*<e!XAEX+?0m;k!$PJ93W

diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta
index 81ee71f1e51be6f62de6119ecfd96b826638eff2..497da9e1e8b0d0a9ae6c4a8f90c287e64ec09a80 100644
GIT binary patch
delta 193
zcmdnbvY%ywI&W*x=I(^aj7L~5PqIEc(ZpCFqBJ6FiI}_E{;Av>z9;@!F|oXk9ja*J
zAJfSZjA}7UQcDukZz>oWn<kp2rdXy~q*)lJ7?~$08W~!eT9{gxCnY8trY0{eJC~kx
zn&I5C{g+c28<*sj=Hwh%6R`HWMA3osmL`6}JEHv5ETSU*__=DtS4}zoaIs4FE1k)k
s8MS11;#c`37MFw;q$HN49_L|Y0D{bbr|V5`sg_Uv$>_v#Y9rSV0MPbMpa1{>

delta 194
zcmdnbvY%ywI&aHYi|@VZ&yKJhoSaiK(ZpE5<~VaI=R$9}Y3W9MTkbC8nOI)O4plVq
zkE!~S)RM&Xn+j$o#%9LJ#wMxBNe0FiNr_38#ztx8<^~pNsRkwnhN+Vc8P!Y|mYqva
zI?Zs7L25$*W8;#%(wv+lYv#thSL1PB${D=BZptmz#)x}UoKI~2qp@0s_wHub#aiBz
tH#2I<u&!I>lUQ65T9A@hl6stnl>rDc{X>k5+4&tN|73JxVSZ}B1OV_|O5^|l

diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java
index 0f67a7e..6755fe1 100644
--- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java
+++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java
@@ -766,4 +766,14 @@ public class MartialMiniController extends BladeController {
 		return R.data(venues);
 	}
 
+	/**
+	 * 获取已总裁确认的成绩列表
+	 */
+	@GetMapping("/general/confirmed")
+	@Operation(summary = "已总裁确认列表", description = "获取已总裁确认的成绩列表")
+	public R<List<MartialResult>> getConfirmedGeneralList(@RequestParam Long competitionId) {
+		List<MartialResult> list = resultService.getConfirmedGeneralList(competitionId);
+		return R.data(list);
+	}
+
 }
diff --git a/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java b/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java
index 939d3d8..75034d4 100644
--- a/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java
+++ b/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java
@@ -93,4 +93,10 @@ public interface IMartialResultService extends IService<MartialResult> {
 	 */
 	List<MartialResult> getPendingGeneralConfirmList(Long competitionId);
 
+
+	/**
+	 * 获取已总裁确认的成绩列表
+	 */
+	List<MartialResult> getConfirmedGeneralList(Long competitionId);
+
 }
diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java
index 15c16f3..978ba03 100644
--- a/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java
+++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java
@@ -713,4 +713,31 @@ public class MartialResultServiceImpl extends ServiceImpl<MartialResultMapper, M
 		return results;
 	}
 
+	/**
+	 * 获取已总裁确认的成绩列表
+	 */
+	@Override
+	public List<MartialResult> getConfirmedGeneralList(Long competitionId) {
+		QueryWrapper<MartialResult> wrapper = new QueryWrapper<>();
+		wrapper.eq("competition_id", competitionId);
+		wrapper.eq("is_deleted", 0);
+		wrapper.eq("score_status", MartialResult.SCORE_STATUS_GENERAL_CONFIRMED);
+		wrapper.orderByDesc("general_judge_time");
+		List<MartialResult> results = this.list(wrapper);
+		
+		// 填充选手信息
+		for (MartialResult result : results) {
+			if (result.getAthleteId() != null) {
+				MartialAthlete athlete = athleteService.getById(result.getAthleteId());
+				if (athlete != null) {
+					result.setPlayerName(athlete.getPlayerName());
+					result.setTeamName(athlete.getTeamName());
+				}
+			}
+		}
+		
+		return results;
+	}
+
 }
+