From 89962c69e6e55adcaa49acf3b7f63f7831d380e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Wed, 31 Dec 2025 11:51:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(team):=20=E6=B7=BB=E5=8A=A0=E9=9B=86?= =?UTF-8?q?=E4=BD=93=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?= 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 632 -> 629 bytes .../buckets/.usage-cache.bin/xl.meta | Bin 632 -> 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/MartialTeamController.java | 8 ++++- .../martial/pojo/dto/TeamSubmitDTO.java | 3 ++ .../martial/service/IMartialTeamService.java | 5 +++ .../service/impl/MartialTeamServiceImpl.java | 30 ++++++++++++++++++ 12 files changed, 45 insertions(+), 1 deletion(-) diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 6add40ada0c0240e02ba607a3ca512223f2f6824..5ddd320a0910a866c19712da4258825971b2e28f 100644 GIT binary patch delta 447 zcmaFP`kZxwI&Ygn=z|#Vf+H*!v(}!SXksidQ&sG|KeOwcjg#yj`M1q@Jh8lv9ja*J z9~*^KCE6vF{ z${1Yu-u|?%@uzRo9pAogxi`VX{HnTchG4zam-f%RU4K7oKM-dCgO=sVrA0-lc_j=> z@=_~G&Wb-+UR;t`RFaxu56z)e`0wZJ52>&PjF7&n?JF1_w!dI)ZY+&$$A1b2ztO9^)b_kr9e_Y-jLA{lv` zHfaPmLSE4!9l}ipx^&SLd5bUh27~9QnYpQ#C7^~({9~h#WRaMhoRpT7lAM-mVQFY-Zf;;= zX>MW!geEDbW=4}E81<|+E|OM{60U8}rU-JGydTwaMCruNS*+pLj}Z zQDC5P`oZa0f3InAXl&L0>%t()FqM@dWby$-ja_ooJWl z{LK>-beQbdc60a}acFGS|Leja%CMG|;mYI#j8gT&+gAA`7MFw;q$HN49_L|Y0D{cm z#ed{AOJ}YQ&dx0GNKMSi%u7GC)HyLZBei+00T}2e78j?M6n892&X};Mxatzaqk9&M z@{0u*l@&8APRRul#Z|?#85o$@SQ%JAW-cnrm@WunFfc4kKD3Mhs2Ir7mj{_JiG#sH cuaAs9%@x+S^hn9d?KzgZfNM>&8WeKPu6aSb_j$l;FT#{Onn0`|s$s#d1IVmkE zB{?nC!qU*v+}yy#(%i%d2u)H<&5Rb7ol8$T&2a8RsuUYz?B=4FY+#i=F59gC7P zCM+thVpx=4%&@4em|<~BE|4g$DxM88VNqGebcTh=hZgFC6i!-e00z337#`iT0O}BA rVq;}s5#(Z6Aj6?xa`b{@4}(I=fliKP5_>pqZs(~wKS%OOKxPR5#2Aq~ delta 361 zcmey$@`Gi9I&bSY^BY=b$BwZ4Vb{Jp(ZpE5UHDXb;cG{u-Mt2v{ng`QCzi*lA6*rY zSXAN|oLQAxJn8gT$y};QL0{e+bW;L z;*!vUl*E$M<2a71>CDx^*_j0%sfjt6dFh9iIwvM)q&BZL00Z5`;^Nej z;*Leh850&2S6yOwbkAZ@ezD-9vSNnCDY-zRxT<(I0|OHqD+3G2%td7x(*;2c28M;n shn6t_6$4rN@*oo?aWGg2HXc#YXfj^Fp7Vg~f#^j6N4}tguUn@A0N!MY?*IS* diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index 870dbfd97325b8089d208d4ccc04cbc294d49310..ba2f4f589005a090a5c38eb974a6d47efa05a02d 100644 GIT binary patch delta 168 zcmdlkv|VU|I&Ygn=!4jZxkp&KmqfNrG%*%vHcr$u?{eF--e~goopC|OCzjW-LlsT@ zW22B{Y>}3jVv>|%W?^P*l5Av=m}X*WVQ6ZZY+#<0Vr(!uf>BNH_3@pX85@`6mFDCe zWnaCY?d`PZ&wp%iUh?{qaZ^st8!hoi(yP5Lch36zjVU-PZ1NgL2@%5(17j;w11l3t TJwtO#6C-mYL$l2{7~|OimO4Vt delta 168 zcmdlkv|VU|I&bSY^Bd(IB}Z5o%)>WNG%*&axcq3-t-o$@E5dA-=Nu2dIkCKs9ja*J z9~%XuWD6s+M00Zk6AJ?))5PQ?!xW=rljLNxBs0S#V@s3C5sYejvDc$A85@`6mFDCe zWncZPRh46ArEiV-yC*-gcI)tj#OO@6>zcr(RvwYLF{{Xb@)|}75rYsz11kelD-#Pn SQzIh_Lj!Yj^UXIH5;@OpdTPmi1dtG%*&KRUjJm$H?dT)bCFs#QY~5omd{HesWbn zVo`}>aAs9%@x+S^CzpU&KzgZfNM>&8WeKPu6aUyKm?ou|C8wI0B$*l+TN)V}8d(|{ zSXv~RrlnXW8mA+!xF{NWsa>j&3#Z{LW9^JE8lwT~ksH~V_aY`&6~(!HoGW4a)S!N9OE`7lV|M4&zfpdJQ>L+lI<94QG&3{eU-J^uB_QZ~#`p2KK& HZSi6N9Upv2 delta 312 zcmeyv@`+`FI&bSY^XuQ@(~qzyTRf7UXksj|??Pqy(I=kQd*j8zZrIc?Oe~L6-@hs# zv8co`II}9Xc;ZEd{YyYBAidN#Br`YlvINwSiGOSqj13LUj7(C@lFiJF%nj4h(hM!l z(=5$W%!~~zlPwc1Cr2>qS)QA!%fr~XB(F3l=g9r1_YU0Jv)cTvl3DD=J!QFD7QFUP zT=vv$)5rR=3}?^xFmh;Y)&I-F(96m&g>&+LMpYT%ZL53|i%UWaQW8s2kMpoH06}K( z;y-fxixx~`5{c_rl$;sV BgC_t0 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 730103de487bfe16deb3b7d553077ac0811bfe5a..ab97096699519f130f4fba643354fa2286f304bc 100644 GIT binary patch delta 322 zcmeyw@`q)DI&Ygn=>1D7M~|>5eHV9|Xksj|*Sfkv_`i4XilPSAidN#Br`YlvINwSiGOSqOp{W~l2c7gl1z<^EsYEfjVz4} zEG?2u(^4!GjZ+d$Cr2>qSss3|eHLTmlDyKKoFgw6vHoMRe|Xq5{>kQNOw+T@e=V+DpU*(fnToPK4l30>@oQIVG2r@(F z&g9D2yk!!TNX8cZ(t@1)#FUOj$r%$C6<1wicy!NVQGT)DqOxL!#VNT!qPVJfHUk3_ z8!H0~NcW<$jOl_P1_Q&w+9J&AW-ho?tR-3<7GK<}~r!05Ng4h0u z%bvPz`dELK;q3VyMh=aw`hQs%dRZB!a8BOOs4648ZIw@AaY<-FN@7XsaUNC%Ajk|} z{6}to(Sk`#B5@syk~1c5(Jw8?$xlpKR9wZdD8HCtQCTs=;*?wF=pqfhzkM3Cj)d@1Ou`;j-9_C&s4Q7vXkYDr@HO$Ad+lVqc0bAx1y#IzJ6Qw!5%6SKrb!&Fl<3!~)Z6yt?u=hBl- zGn~^;V@PIfT#{FslXGOvzo*YLvOhG|1pbJ7nf_^C+~QKp`IExU-&8)n*0|cc>G0&u sj9N0{_gDEO7MFw;q$HN49_L|Y0D{brxidLGEEk^qlhKLg_mPFI0Ce?Ij{pDw delta 194 zcmdnbvY%ywI&bSY^XnNpM~|@hO`P~>qKUDy~? tH#2I<2ya{ElUQ65T9A@hl6stnl>rDcgBSmiQ`uuS`6r_j3rBqTJOD!;Ppbd` 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 14a35d93716c231d06b11d64e3b4ba9b7a2c26c6..b41effe7700f8924fd14840130d124cacdd8012f 100644 GIT binary patch delta 179 zcmdnbvY%ywI&Ygn=>3Qrg-2MfXdI82Xksj2^!=;V8!4B^ODAZk2H!0coLFAR4plVq zkBx$E@@7UY8S(q8d=iUGLJLw7 eOHz;XurdHaX2{%`oFA48PyWg1#Pa*d!d3vb>`i_E delta 179 zcmdnbvY%ywI&bSY^Xn@AQjV~Em3A(lXksiNSg*B-!PNc4iZz-63pfLeCzjW-LlsT@ zW22C2U~FKXY-ns|o@`{EWNBoQW|Ev}keX_eY+`6>WS%%Vf>BR*S|uARW8;#%(wv+l zYlL5wlr`7JzWVJyRcDpCt submit(@RequestBody TeamSubmitDTO dto) { MartialTeam team = new MartialTeam(); + team.setId(dto.getId()); team.setTeamName(dto.getTeamName()); team.setRemark(dto.getRemark()); - boolean result = teamService.saveTeamWithMembers(team, dto.getMemberIds()); + boolean result; + if (dto.getId() != null) { + result = teamService.updateTeamWithMembers(team, dto.getMemberIds()); + } else { + result = teamService.saveTeamWithMembers(team, dto.getMemberIds()); + } return R.data(result); } diff --git a/src/main/java/org/springblade/modules/martial/pojo/dto/TeamSubmitDTO.java b/src/main/java/org/springblade/modules/martial/pojo/dto/TeamSubmitDTO.java index 71273ec..a40f76e 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/dto/TeamSubmitDTO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/dto/TeamSubmitDTO.java @@ -9,6 +9,9 @@ import java.util.List; @Schema(description = "集体提交DTO") public class TeamSubmitDTO { + @Schema(description = "集体ID（更新时必填）") + private Long id; + @Schema(description = "集体名称") private String teamName; diff --git a/src/main/java/org/springblade/modules/martial/service/IMartialTeamService.java b/src/main/java/org/springblade/modules/martial/service/IMartialTeamService.java index b1a6562..aaf9fbe 100644 --- a/src/main/java/org/springblade/modules/martial/service/IMartialTeamService.java +++ b/src/main/java/org/springblade/modules/martial/service/IMartialTeamService.java @@ -14,6 +14,11 @@ public interface IMartialTeamService extends IService { */ boolean saveTeamWithMembers(MartialTeam team, List memberIds); + /** + * Update team with members + */ + boolean updateTeamWithMembers(MartialTeam team, List memberIds); + /** * Get team list with member count */ diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialTeamServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialTeamServiceImpl.java index 06c64e4..920e704 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialTeamServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialTeamServiceImpl.java @@ -53,6 +53,36 @@ public class MartialTeamServiceImpl extends ServiceImpl memberIds) { + team.setMemberCount(memberIds != null ? memberIds.size() : 0); + team.setUpdateUser(AuthUtil.getUserId()); + boolean updated = this.updateById(team); + + if (updated) { + // Delete old members + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(MartialTeamMember::getTeamId, team.getId()); + teamMemberMapper.delete(deleteWrapper); + + // Insert new members + if (memberIds != null && !memberIds.isEmpty()) { + for (Long athleteId : memberIds) { + MartialTeamMember member = new MartialTeamMember(); + member.setTeamId(team.getId()); + member.setAthleteId(athleteId); + member.setCreateTime(LocalDateTime.now()); + member.setIsDeleted(0); + member.setTenantId("000000"); + teamMemberMapper.insert(member); + } + } + } + + return updated; + } + @Override public IPage getTeamList(Long createUser, Integer current, Integer size) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();