From df7efac819720c3793bdec49b3a9d7849ad03bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Fri, 9 Jan 2026 12:58:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(schedule):=20=E4=BF=AE=E5=A4=8D=E9=9B=86?= =?UTF-8?q?=E4=BD=93=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E5=8F=8C=E4=BA=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改MartialScheduleServiceImpl中type=2的显示文本从双人改为集体 - 保持与前端项目管理页面的类型定义一致(1=单人,2=集体) --- .../buckets/.bloomcycle.bin/xl.meta | Bin 743 -> 743 bytes .../buckets/.usage-cache.bin.bkp/xl.meta | Bin 637 -> 630 bytes .../buckets/.usage-cache.bin/xl.meta | Bin 637 -> 630 bytes .../.minio.sys/buckets/.usage.json/xl.meta | Bin 2360 -> 2360 bytes .../.usage-cache.bin.bkp/xl.meta | Bin 636 -> 636 bytes .../000000-assets/.usage-cache.bin/xl.meta | Bin 636 -> 636 bytes .../assets/.usage-cache.bin.bkp/xl.meta | Bin 575 -> 575 bytes .../buckets/assets/.usage-cache.bin/xl.meta | Bin 575 -> 575 bytes .../MartialCompetitionController.java | 17 +++++++---------- .../MartialRegistrationOrderController.java | 2 ++ .../martial/mapper/MartialAthleteMapper.java | 6 ++++++ .../impl/MartialScheduleServiceImpl.java | 2 +- 12 files changed, 16 insertions(+), 11 deletions(-) diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index e34da13dc728e303ba09f51103920abff805eb10..7b70dcc43fc90533ccad9c0d6fc5189a56aee2f2 100644 GIT binary patch delta 445 zcmaFP`kZxw2G4ifJGat&kFZ?+FV`{A#8^N`$bQ8w1lEfP&FCPy&p)obYGA7X4=l2@9ObCfaI znM*M9;aYX`VAdyzF)=5za#a6pyly}L+=+7Kw0Q{K7L}x?9Oq#LsmM&|dZjP<%xqn9WpYlcbAE0?PAX9L4ub$(L3^71gDv$J z5&T8^moye4xcBsbYx%*s9a0AD+czP&VFpG%-3aa^1J-Hb2<|xpl@ew+x0B1jzH%;t z>t>)U%md*j16|tLWRP3<9wEKYz&KPL!Tn`mT-FNbc9|JezcWE_iwx#^u_3tYtUmom L;=VGdn5GB-D`t`# delta 445 zcmaFP`kZxw2G6!kA7NS6d$eYviLroaq>ZlXfA`O8B?6O$0_)l*me;dE)J*(i zqmW`^VQOq*WSU}TnrLikl9Zfmk!)yUXqJ|0m}FsMWIQ>7QLp~R*G*-NjZ5-Mb8?O{ z2H)C!BlE%NIi=bpTw+-AP!y^g+aik)KPB4svB-=F7I-59{2WqERGQBi7M3B!`S z)QXa`ZmP?ROA?DpQd5reu!2-%#+Oah%N0MkF1a!}C)GJWw;(4KD0_!N0Ir~zSHC%- zz7@gu)UTd92f=OCZ!LO?;2zYkx;O#B{i{F!WCWaBVrg~3CKbUg)&Eywhv071U#xK% z!F{WLy!1ANn+$Ymsiyw?NPD<+X{!F|<|YJpq5k^AkqGWx{Y$K`;M_7v{UcKzAh@CW PJJ`P=xD)ly&VCO7_hFcV 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 4b1f247b129f775a58a7a1852a11503f04a7a63f..8c6bf7ae31a40f6960a927d3ed614b3616ec0096 100644 GIT binary patch delta 358 zcmey%@{MJJ2G4ifJL?R1j<6_wY0;c$Vl1Hatd2KzucyhDeQwJ)Z24O?u{=)w@T!2s zq7uj8%&OGli5D3TF9ETD^itoD%-qz=5*-jjCjK#<9KooTwIsD9G5w}OqLGoMQL>py ziczv*YO1A$nPqZfsAa~JBA z1`GdM-R?1Gef})FxlJrxX1mTWX^eG#;4`I$Lu0G{Ul#^ZhPkW^DV&oJGD_Ba?Ox@R zSX>fXkdj!EdYp%q0SGb^x?UNmt=+adI6JezBQ-H6GcWznQs>0vjMV03iN(dKCB+?! zk~1bODz0K!lwZuSsH~V_aY`Vp(cT5A9Xx|bMRV?BU6 uj(e^`j4al delta 366 zcmeyy@|R_T2G6!iGNJhm!y^?rr%UBG&8p_OHN8oG*7Zf zO*BeQG_Wu-GBh-|NKQ^PvPd$SY{;nQys+$CdeUiza{_D2y%`&q+9C;5P%l(-m@7grOwq%)Pr-Szn4vnq)e_a?v8LqN2uy9R2$S7Iwrn1T> zvA86(ASJOR^*9eJ0}y1!mrc~4Q1NMXaCT;aM`~hDW?uTCrOt`T8L7={4ZuJ*vA8(3 zq_|^Ia>j&3#Z{LWTVp*IDl2AKoRSM9imQreGcYl6b1<-j%v@BKF{qfcDM8GGFJlAq-_roo-j1;V 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 9b3e58f38ffdca72583b2626a966ca9b72e9ad77..966512b4e74cf9674ac92ed46ac8b13addd9bc2d 100644 GIT binary patch delta 344 zcmey%@{MJJ2G4ifJ6-$Sjc#6LC)iAF}2M#*L-DMrbLsi~G0W|ql` zsm2xtspck@X(oxLlOq`Qtfk*Ad(GImB(F3l=g8v+U*|5=DGe6>wYuG7&iedWc5|Cp zy3BT+U(y)s{J>{Q4Tr{7{l6{@q6~9c8B#bWA7qrQ_u9S6C$YFBv>+w1B=tBCD+3T@ zCUm_rP+Plgb#QiOfk$d$PG(;Ep{34=$r-85%My!=Q%j0F7A0p)SX5lauqeNnVNqEz z!{U@&AW>XZJR4-fqOy$X3=5MFEz}1ooV3;e40JCsw#Iq@b;vO>adR-R%W*NtF5pn$ fI{M48he09bKqtpCi9H-QxARn;pCj4BzSa={n6HSw delta 351 zcmeyy@|R_T2G6!7~9QnYpQ#B|0F6O#EY`U}$D;VV0bfoM@h8k(y|foM>QS zWMpV)ZjqdvXk?LOGC6`#&w8=-rDc zjVvuT-(XB&2LSTELPr1q 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 18aaa3ffe27fc82ea4ac0166e97ed8e57c26c987..ecb413fbcde8025a836ef8d0d428c55ebbb5dc07 100644 GIT binary patch delta 190 zcmeyv@`q)D2G4ifJIQM*kFdndEeo1xVk{sQP;iE0wPQ?Q&cyoJ4>dMUEU#ySsG0c3 zbaDivTFjEvlEn0z3W=7+W=6)Qh9+jlCZ=W5n+!Grnme;dE)J*(i zs=g$(Br*M_LW)tcu~CYVxrITBrKypLS)y5DikXptv5`fRrKw4x`D8;zHPeM<=hBl- zGn_k~bXtnBaYdPCpzKpe;SYFQtQ8V#R zQfQ*3v6+#vsiBFPv5BdfMT&u;fkk3UqN$;gNt(HZaoWPNbLmN^8O}|6JEw`UaYfX fkdj!EdYp%q0SGb^x?bsD*Z(|;se|A=%X@+y<5@zL$jZ5-M zb8?Qn)VjoaD!%cF!ogFkcDTHW-4%7bu`WjK^8xlV)6ZVymGhpwnbATw=c1|Z0cFPo@0$7sqVrV1AJkV#AcJkCpy 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 be4d75b00b4f93c6a47189e746fdb9687e485396..321100aa9d9614370ea9d51ccb0b6b973fd31591 100644 GIT binary patch delta 177 zcmdnbvY%yw2G4if+b>);9bvJ*c7ORq6Jr6DgL~geH~Q@F**lZ#_)FLPiRJZd5H%D3 z*eIl>r6yY%q^6pirvialQld$6vZZBmYO0};rIERz$>az|J>89!^0ADKOY%x{a*nKN zUU@`mve5te*~Lpe=dW8Jlmmm5(*IlMANy;@Zkf}Q|vAmuQqGsYB z8-*kzW5XnKvlR1WQ!@+0#H2K1lT<@f3v)9|V*_)G6tl?@jC#6^C2!Li8<*sj=Hwh% zWA)wQs)O2p-lEudCI`4A4isO0nrU*CpS^mYVtZ@6!pF&*8MS2GR95*U7MFw;q$HN4 c9_L|Y0D{c;vWfb>EUA-!GCHxiv1{!F0OY4cJOBUy 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 5969893f23c70f0a8532ea6be523c8b8e41b1c2a..a87a6ed7f8a4bd51af6959ddff31425410c16588 100644 GIT binary patch delta 192 zcmdnbvY%yw2G4if+Zzt)A7K%bW&bhJ#8^PA?uV=9N%w}GmY1cbN4f8rSYFQtQ8V$6 zsrr)ClEn0z3TbJn$(9DGspjUXKwy@XXp)?4X_=gwYG`C>WNv6O*^p7qbYa=K^rX`a z=b}{~eqwA~l2@9Ob7W2P$|FjXh5paaE?(+6f87G1Y|l-78$@S3HMvwgd-=Dw36nQ7 rYRP!*UgeWmToPK4l30>@oQIVG2r?78Ug`VT{+Rre(TU}M)3M6{pTSbc delta 191 zcmdnbvY%yw2G6!DkK>h8zz~XrI;t1npqeoCZ!phq#Bx9n44J|8<<<9m@O detail(@RequestParam Long id) { MartialCompetition detail = competitionService.getById(id); if (detail != null) { - Long cnt = martialAthleteService.count(Wrappers.query().lambda() - .eq(MartialAthlete::getCompetitionId, detail.getId()) - .eq(MartialAthlete::getIsDeleted, 0) - ); - detail.setTotalParticipants(cnt.intValue()); + // Count distinct participants by id_card + Long cnt = ((MartialAthleteMapper) martialAthleteService.getBaseMapper()).countDistinctParticipants(detail.getId()); + detail.setTotalParticipants(cnt != null ? cnt.intValue() : 0); } return R.data(detail); } @@ -61,11 +60,9 @@ public class MartialCompetitionController extends BladeController { IPage pages = competitionService.page(Condition.getPage(query), Condition.getQueryWrapper(competition)); List pagelist = pages.getRecords(); for (MartialCompetition martialCompetition : pagelist) { - Long cnt = martialAthleteService.count(Wrappers.query().lambda() - .eq(MartialAthlete::getCompetitionId, martialCompetition.getId()) - .eq(MartialAthlete::getIsDeleted, 0) - ); - martialCompetition.setTotalParticipants(cnt.intValue()); + // Count distinct participants by id_card + Long cnt = ((MartialAthleteMapper) martialAthleteService.getBaseMapper()).countDistinctParticipants(martialCompetition.getId()); + martialCompetition.setTotalParticipants(cnt != null ? cnt.intValue() : 0); } return R.data(pages); } diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java b/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java index 4eb573d..6bc1b46 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java @@ -385,6 +385,8 @@ public class MartialRegistrationOrderController extends BladeController { newRecord.setGender(existingAthlete.getGender()); newRecord.setIdCard(existingAthlete.getIdCard()); newRecord.setIdCardType(existingAthlete.getIdCardType()); + newRecord.setBirthDate(existingAthlete.getBirthDate()); + newRecord.setAge(existingAthlete.getAge()); newRecord.setContactPhone(existingAthlete.getContactPhone()); newRecord.setOrganization(existingAthlete.getOrganization()); newRecord.setTeamName(existingAthlete.getTeamName()); diff --git a/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.java b/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.java index c3ab1fb..22eefc3 100644 --- a/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.java +++ b/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.java @@ -22,4 +22,10 @@ public interface MartialAthleteMapper extends BaseMapper { */ IPage selectAthleteVOPage(IPage page, @Param("athlete") MartialAthlete athlete); + /** + * Count distinct participants by id_card for a competition + */ + @org.apache.ibatis.annotations.Select("SELECT COUNT(DISTINCT id_card) FROM martial_athlete WHERE competition_id = #{competitionId} AND is_deleted = 0") + Long countDistinctParticipants(@Param("competitionId") Long competitionId); + } diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java index 03f0337..6c6351e 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java @@ -348,7 +348,7 @@ public class MartialScheduleServiceImpl extends ServiceImpl