From 9fa5eb46df710671735c42e04106aebe4d881eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Wed, 31 Dec 2025 17:32:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(score):=20=E6=8C=89=E5=9C=BA=E5=9C=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A3=81=E5=88=A4=E6=95=B0=E9=87=8F=E8=80=8C?= =?UTF-8?q?=E9=9D=9E=E6=8C=89=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buckets/.bloomcycle.bin/xl.meta | Bin 743 -> 743 bytes .../buckets/.usage-cache.bin.bkp/xl.meta | Bin 637 -> 629 bytes .../buckets/.usage-cache.bin/xl.meta | Bin 637 -> 629 bytes .../.minio.sys/buckets/.usage.json/xl.meta | Bin 2359 -> 2359 bytes .../.usage-cache.bin.bkp/xl.meta | Bin 626 -> 636 bytes .../000000-assets/.usage-cache.bin/xl.meta | Bin 626 -> 636 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 | 15 +++++++-------- 9 files changed, 7 insertions(+), 8 deletions(-) diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 6985442d0727507575ee16859e8e1a756f2e27b6..19d188816385219ade5b3c3375921f43a4c0d8cb 100644 GIT binary patch delta 445 zcmaFP`kZxw29MK+_Q2iqkFW$^j*XgVVk{v1e}0dBfXA%e&-xE5^}HyWSYFQtQ8V$6 zjY6VnlDWCDg`t6kVM?-*ky&Djp@ET^v8jb|VzQ;ViRI)7M!ou`NZ0v{jZ5-Mb8?O{ z27k9Lc-ULQ`~LI|&Yk8`cf$OBC$&62zT^L_1NThJQvG_3B^kh=WqERGQBi7M3B!`S z)QXa`lE%x6OA?DpQd5reu!2-%hP-W1zNa^RU2sjFZR~9M{er-T-OH}565Jqq}s7(Cjf#AMT*;4oh&V8++vXjLZ!A()Qsosd-F3{#W zIvK&eqjI_LBZQj_bm!R{UjT0f;pz|C260>F8y_&8CN*i5Va6RI)m^HSmJ?{blz`UP~~5LCf;w(xRf&yb^{b zd8rj8XC+=QFD^+eDoIT_&cg~)kr{Glfx;g4gX@wjlXFs?^K%PwQh~B}7zE%7ZptXW znqU73!H-Z}z2PTg-hQqQF3^60m0p%_%>u2g8N2E`|Jle_l|~AgtQBS Ro1)~pP#nQspwV^bIsmZwptJx0 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 375b26064808038503db9b3f0d2a0ac9327037ce..385bdeb24405d9af58bb0333a73fde04b0bdc9a9 100644 GIT binary patch delta 357 zcmey%@|9(R29MK+cJs!7BP>sD9auBb#8|-4_gKemWe@Jfvvq`m_Fnxnu{=)w(5isM zq7uj8%&OGli5D3TEdjBB^itoD%-qz=5^WGeCjK#<9KooTwIsD9G5w~3rGZ(hsYRNl zWlE}fYO;xiWuj@asez%9VUn4Vg+-Ft!m@MeNv9dkv0ePY%hC8;He={FS;Ee%bQ4U;qz zSJZpt>kik9 zEh+9;l$oxYnYpMeW4a)S!N9OE y`Ordrkj_cV7O50hF#z>3FmN(dnqDyA-&Dl#rGa-3gP+2_qy#Y!z6@#2lP3X=ppJL| 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 031c025cf18194d92e375dfa93d76fb6627a94bb..84123746620745d383c934853fbb005ebb94bd12 100644 GIT binary patch delta 343 zcmey%@|9(R29MK+cA2o|BP=!dxU46d7z=c}J^Hs~k^9S)&jmkhnq*Kvu{=)w(5isM zq7uj8%&OGli5D3TEdjBB^itoD%-qz=5^WGeCjPNeurx4BHMK~yv`k4gPfa$luuL>f zHZ?FbGE6cvvam=pn;gNYXMN_y9v{ZWC3&SeIY%Dt-*;*EH!Uv?b2APv+wO}$*k1Ne zDCSOoE6i*h_A~WdD2K*Y{l6{@q6|}68A3QGA7qrQmo!@ClUQ65T9A@hl6stnl>rDc zL*6#1Y@D-vb#QiOfk$d$PG(;Ep{34=$r-85%My!=Q%j0F7A0p)SX5lauqeNnVNqEz z!{U@&AW>XZJR4-fqOy$X3=5MFEz}1ooV3;e40JCsJi2EA)FH^k#>&7V$i=WghC{*R e=mp0f28EOZogB*~_Hf+X&Qo=MjwI^^fqDQb42U=Y delta 351 zcmey$@|R_T29G_{wpvZrBP=bQ|KCnDF&5Bxp6CB1)uL{nqKWJ|+T zGZXV9OY<~?q%;H5$q|ft)?Z3K7BV(2$t%stIr6GbRkGs!zM|eEUw61>9G`UW;`h*B zJ2<)b9iA0BiGl6XFAj~Z`hQ&*L>aEKGO%z>KFBCpFY#)XPhxRNXhBM1N$PPPRt6x* z47syFLwSqk>fr3m0*}XZJez@mi4ABI$jn7$8Pf$p3wn(M8iUFvP jfq|2u()5A>|E3~_FAcnV82l9WB_)V?@MTDAo;(QvkIsnE diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index c10285ca5062cb127248a75816caa268fd1fd0a5..795d7e2fd17c46e02f07853641174feb064abcac 100644 GIT binary patch delta 178 zcmV;j08Rh561NhNC=5dIhgSxl!~{d^cqWlFGZ2~nrRR{LOC+A9WBf5@wqcQXe+EME zhgSxlk^D6$q-AtrXW1ZQVlgpcVL4?nGB_|cG&nghIW{#gGBY?gGBY${WHe)wF##Sn zp?1z^V#@%|QREPz0fD4$b!=?K2dh@1D|l4IIMYv)imej~A!y{XSQ?a3D6nQwb7w1z gz3h{$0UHrHIx{gkG&C+YF*PV!Z delta 177 zcmV;i08an661NhNC=5RWw&VTd!~|SGU|x|lGZ5T}T&%(SN!o<;eN;{DFf5UGe+EAS zw&VTdk^D82SOFegq-AtrXW1Y#Vm3H6F*7$cH#splVq!NoV`4C4GB;x~I59V3HDYF= zcFt#F%K*-ioFO{_fuwGAY;45`t1=6PM%!z@EFf`35U$jD5qH#wJMA*qnAYSx!166j fvXiU<8xc4sqO#ET3kmw;G6dZ}+nW^U?bi8hEK6aSb_j$l;FSdv?4C8@`GSQ&sIGvsZ9O7XdnNlYRcTl7l{a`F>XIu<2oOjuN0b&288J&Q&8#e$2< ziWwHCSF-vVPH7K&d|V-l90p@ VrBKu3Uw7~9QnYpQ#CE6f{O#EZ2z9h9IG5w}OQd+8|nX##nNs^&O zib<+jqJd?iL7GWQVw!o1v8i#|WJ5+Z$Ax9*(vwazoC{FYZ)I#;l2@9ObL75O%3k|j znVA=gw=l8Dc&AKKl1sZ%yko;v5#0|Do~<;U$f2=S|1S$eFDt_o&dK{3Rb?bzt@24M zE(tA2Ni0b{&cn(81eqas7N{E?em#jvB(7soa>m3h`lSUq`H3luimMnFGIzc8jRt6Tq!yF6^910~G6G~g`4_tU; QmR=lk^u!IGy$znX0b{j>BLDyZ 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 b3ed0fd7a5f4c9f98627d011ee252d5731eb319e..5fc2cfc637f362f0631d3846ec48a4079dc7e9cb 100644 GIT binary patch delta 336 zcmeyw@`q)D29MK+w!3?$9$_)=EBrap#8|**!?w=p!48>|XKUZvR*`#oVtJhU$yEV~ zMJ0~GnN_L96E8BHTmoVN>7~9QnYpQ#CE6f{O#EZ2z9h9IG5w}OYLc0GnnAL;QKCt* zVUnqlsexH?a$1tPg@uKYaiWp=WJ5+Z$Ax9*(vwazoC|b{n$Fm`B(F3l=g7-#DHRDP zeH7HgYYuJ=xXpEa@%&g>C7uk`O{YZou9+84;?UTt|Cfc~E-Qlz*W~?-sxp#Bt9%lR zOF|1$5=&B#^RO}iL1xI?29@G-A(NOyGPdZK7Ubk7rgSVy&X};Mxatzaqk9&M@{0u* zl@&8APRRul#Z|?#85o$@SQ%JAx)+sYOcw+(7#J2N9|q~02-L>_)Wg7Vh@GKce=B8ejXoDCs@sH``2u8JxC8;He={FUU(o!wWj7^P9 zk_;_UOj6Af4J;E4(o9kk)67$hO^wqQmYqvaI?Zq{H*k&tW8;#%(wv+l_q9^?+V9HD zyimM_iABacWs;Iy+LhuR8?K7zet7U~rRhWtjjj5BSr~d*8K!Vf-p{BiBk^jLPhxRN zXhBM1N$PPPRt6x*47syF-RSV^NlYSf9gC7PCT`I$Ey&4FOj%T1#jq&9m|;;_F~j1N zTp&?gRXiKW&6v)xF!>Nj?F68jOAL?hSpd}uGO@8Tum~RJU})e_DAAZu+G2m;!XvZv P;*g^!Zt(1F@VpHG`lW4-g|UgbfvJV1XnjQzY`L=Ohdv-=*VtG9qM9suM zHVWnjCWe-V#unx&hGqulrUr&7X=Z83W=6@$sYaHTMuw9k81-~zF12l8Y+RC8nv-*6 zO>5te4Lon`nl>LgxLK;tpyb5A?FOBB`g`(CSe$;Jbh?trNm&2@ 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 fe5b81df620040ebaeb469be3061e583bd09089b..7050b6fb33b58fa7bdfd592cea9a6f7d8773d7d3 100644 GIT binary patch delta 177 zcmdnbvY%yw29MK+wlYr7BP@a%XDuh17z^wRx^-x?sq@5bm%^;IJT@v#EU#ySsG0c3 zM#0E1HO17zEX~l^!q~*zz|_LhG%Y#Bz}(o_!qC**z<6>5qn>W+-{OOejZ5-Mb8?QX zxv|%^Pw;@{r0=S4mQLO>N#}sT>Vx|&676>{IIH>5B9(RWW=1U;NuyOhiNz(M1u2Oo csmFO(8Gs-&|O zHLZO=Ht@W$YubG1;AW{lgOU^fwi|Tj>F>!mVR8C>(&_r-&5T+y60cVIBo>#17NjJW dq#oyCWdMTAkUI<1k7eJU{FBj%rD*A*Bmkh5NKya* 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 9004f53..7bd2342 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -212,7 +212,7 @@ public class MartialMiniController extends BladeController { private void updateAthleteTotalScore(Long athleteId, Long projectId, Long venueId) { try { // 1. 查询该场地的裁判员数量 - int requiredJudgeCount = getRequiredJudgeCount(projectId); + int requiredJudgeCount = getRequiredJudgeCount(venueId); // 2. 获取主裁判ID列表 List chiefJudgeIds = getChiefJudgeIds(venueId); @@ -265,17 +265,16 @@ public class MartialMiniController extends BladeController { * 获取项目应评分的裁判数量（裁判员，不包括主裁判） * 按项目过滤：检查 projects JSON 字段是否包含该项目ID */ - private int getRequiredJudgeCount(Long projectId) { - if (projectId == null) { + private int getRequiredJudgeCount(Long venueId) { + if (venueId == null || venueId <= 0) { return 0; } LambdaQueryWrapper judgeQuery = new LambdaQueryWrapper<>(); judgeQuery.eq(MartialJudgeInvite::getIsDeleted, 0); - judgeQuery.ne(MartialJudgeInvite::getRole, "chief_judge"); // 排除主裁判 - // 按项目过滤：projects字段包含该项目ID - judgeQuery.like(MartialJudgeInvite::getProjects, projectId.toString()); + judgeQuery.eq(MartialJudgeInvite::getVenueId, venueId); + judgeQuery.eq(MartialJudgeInvite::getRefereeType, 2); // Only count referees (type=2), exclude chief judge (type=1) and general judge (type=3) List judges = judgeInviteService.list(judgeQuery); - // 使用 distinct judge_id 来计算不重复的裁判数量 + // Use distinct judge_id to count unique judges return (int) judges.stream() .map(MartialJudgeInvite::getJudgeId) .filter(Objects::nonNull) @@ -392,7 +391,7 @@ public class MartialMiniController extends BladeController { .collect(java.util.stream.Collectors.groupingBy(MartialScore::getAthleteId)); // 4. 获取该场地的应评裁判数量 - int requiredJudgeCount = getRequiredJudgeCount(projectId); + int requiredJudgeCount = getRequiredJudgeCount(venueId); // 5. 根据裁判类型处理选手列表 List filteredList;