From 2f9fbbb2aa74135150d940d84833253e721a6ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Wed, 31 Dec 2025 14:15:26 +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=8D=95=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 - 修改autoGroupParticipants方法中的projectType判断逻辑 - type=2(双人)或type=3(集体)都映射为projectType=2(集体) - 之前只处理了type=3的情况,导致type=2的集体项目被错误标记为单人 --- .../buckets/.bloomcycle.bin/xl.meta | Bin 743 -> 743 bytes .../buckets/.usage-cache.bin.bkp/xl.meta | Bin 629 -> 629 bytes .../buckets/.usage-cache.bin/xl.meta | Bin 629 -> 629 bytes .../.minio.sys/buckets/.usage.json/xl.meta | Bin 2359 -> 2359 bytes .../.usage-cache.bin.bkp/xl.meta | Bin 636 -> 636 bytes .../000000-assets/.usage-cache.bin/xl.meta | Bin 636 -> 636 bytes .../buckets/assets/.metadata.bin/xl.meta | Bin 1466 -> 1466 bytes .../assets/.usage-cache.bin.bkp/xl.meta | Bin 575 -> 575 bytes .../buckets/assets/.usage-cache.bin/xl.meta | Bin 575 -> 575 bytes .../MartialScheduleArrangeServiceImpl.java | 2 +- 10 files changed, 1 insertion(+), 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 5ddd320a0910a866c19712da4258825971b2e28f..429b9bb7686cd443d05145b613dda832c8a66855 100644 GIT binary patch delta 445 zcmaFP`kZxw29Je7p~|0iM_9HBP(&MDLhT*Z$bAx&!1=VBpAS;WqERGQBi7M3B!`S z)QXa`5_!vuOA?DpQd5reu!2-%hU^cKadd23mt2{glj@wGTac3ql)b|s09Ua4f~-ko zy(gT%hewuYk}!hnAzN0q62WbeP1NQ^a1Y3;rffrS|H#^ZUIypxwUD)CDMfHgWZmvs zBDfo5t#)`pxXD15?tLTMX0sbEy-!0ndAALMn<6{C|2u-aKzZZYBM9yt+3rUh;oSWa QvhyA|Ah;p2OQOF40Ge8sO8@`> delta 445 zcmaFP`kZxw29H7LgBb6EBPyj&zb5fo2a|?1(fwFfP1mFs0iE?Ep z)^A1d1GzTsj6!gGxfXk_MsQDZo$GxI=gwy3T0gBE!FA+Xu5<^%t>rprWrX1Fu?sb!L>@#F|bJ>43Mr`H)9m*kb^+aR2Tji43^(+9C@^s zak??@oVKGY_f?y$UHE#j>-LGKv=#*h8mAwep7r;d*5u8M>N4W@SNS9smxLCiB$lKe b=V4_4g3OS)Gr2ZipD_6wV>Qc@fXosA{WM1; 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 762b39676502c8c8717e0fbb5a904b5d6a71bb72..0054ac0870cc84b7570d0eb538e239c76dbbd43c 100644 GIT binary patch delta 192 zcmey$@|9(R29Je7!EN8SM_7bU_G?cxF&5aN5`I^h(M4f9?`EzrE%~&G<@Ib3H531s zsxL_`Nld?~V32B%m;xkH(vp%A4J?yWOp;SgQ!R~5Op;73lT3{#8#1byE-X8jo^+bw z+=PNjM;IHI+9C?)49r8$Nx?x)6W{2$_`EsATwU{NTC5h=b6_P9xlarIul2Ve>QY|bEEzQjhOf1b!jDXN2#njAbVcEI#q|*%N zKBP*qF*YvAE6vF{@@OsNbYtE*ZAVw`t2SA?@bzNX?GsOFEeZ@YPCqz3>+dzK$(tF~ qWyJ5V@<}W%2`xxTEJ;1i!^!{znIUs$a&5dmVe&V|YL+JfnI!=4xljB6 diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index ba2f4f589005a090a5c38eb974a6d47efa05a02d..5e5a7426c584ebbddd01e8dcb95e30edc0e300c2 100644 GIT binary patch delta 163 zcmdlkv|VU|29Je7q51*6BP_;}>6{Zyj0N799iGg**XPTOMe{^ic$(uUme;dE)J*(i zqhOwrYH4nsl9p(gWMpJ)VPR}&V4P@TmS&h}WNx08XgoQBQB5yRxOqEck&8!SftV~SwOe~Fz P4NZ+Kj5gn3jAsV`T^l(% delta 163 zcmdlkv|VU|29H7LgV>0Y%n>3QBCjl@tvC)8<*sj=Hwh@ zU%j90?X>65e{67G^7@i-Q%=qsE%8UvtGzCF&iea}DL5)@@)|~IL1QaZ11l3tJwtO# P6C-mYL$l2{7~|OiD8xYx 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 d55a08dba4f16122d5d2fa9384a7888d9c04f91d..43caa08cbef876f09d16a3f04b517e54db6009c9 100644 GIT binary patch delta 176 zcmeyv@`q)D29Je7!G?QsM_8`?E039IVk~geHBw|Bm*>enIRg2WK4<<GBw%QAT8NE#lpZMB`MJ`B`G!4z+`d+qn_@Zf40GljZ5-Mb8?Qn z?C5^Iu5H1LV^7#_PGsV=dKsirzTxs_fy3WlaPAbTn|OTkW=2C9iQH8_iNz(M1u2Oo bsmFO(8Gs-&WPgY(%f#YIOcgAeFJoE(KAcCt delta 176 zcmeyv@`q)D29H7L{m<)6j<7hE^;=IgF&3CrAR6_@$mjXg?@uDc{3jfpSYFQtQ8V$6 zje==Xidk~1iAj>Fk+G$bp`nqbk%6T}l4)9sWukFPqUq!aMm=2@sY_*yjZ5-Mb8?Qn zT*Ug1#s1-8)A%QwpD|6(I{&r2f>q0Bhoywy{y^a<3yaB{84YE`@2~PnEG`KxNJ%V7 bJ5#do{ZTO%j?-7Y9{_M zogBfa7PBO^Br*M_f`Msrib<+zqD7izYO=9GTC#bHg@Hv%Qleo>QfjJ!$-=U8=}D&< z&fU9sQi`#0NnUAA&XJcL-LKcREtqla3ERzyOq^CPgH*~lT;42j`1=daog#G;k5Asr qXec9*yUHiAxFob7C9x#+I1eiW5M+kz50Pb=SUicTf<^OXOe+9IR8C0% delta 191 zcmeyv@`q)D29H7L{YxrGkFY3x7k8UzVl1%Ny1GI5zjyG8q6ZZ#>NWmOEU#ySsG0c3 zRDDTmNn-j<1=FMyv*c70lO$6kV@o4LLnBKg151k})3g-JMB|i1)5(U6YNiXz&ZQ@v zW;l2F#r9c@jZ5-Mb8?QnT*Ug1#s1-8)A%QwpD|6(I{&r2f>q0Bhoywy{y^a<3yaB{ r84YE`@2~PnEG`KxNJ%V7JLt0B3rAQUywqDZ(ZpE5DlF>7f#3dByO^K5=l?F!m{?xN4plVq zkBx#+l9_3uWvXS8Nt&6VQBsPjp}C21s-bbBfk|>&YI5r22u3}<=>?N285@`6mFDCe zWl?LN?a{i-G9~H2_7l9a6P@1{SDTg=T8CUw-tzN*tX7`R<}Hi~Oza`s7ik}0GTtoB HGM^CuqO(4) delta 156 zcmdnRy^DK-I&aI;tK7~^c}G~5ToQRc(ZpEbI&+YBu$kMXnJ%lYn@Df8pIBbU4plVq zkBvfNQc6;yv7xc4ak6EKK}wo|v1O8(k(r@ET1s+KiiPFm2u3|U_8UtVFg7m9E6vF{ z%AzI_t(sr>*=B>*8HLOFj1FscmxX?Ei0L|6k^QzHbGPg7&081~nAm;)TL@^r5ZNrv HGM^CuC_p>; 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 a71a90cc50f5077bb04b1c12f99bd8c3d4ca8cc3..fead6385a3e63391d26c36cee39ecc220fee5220 100644 GIT binary patch delta 192 zcmdnbvY%yw29Je7f$@B+BP>_WlsZo|F%~HKsCD@^pGWWf`_6BpGgBoeme;dE)J*(i zs=g$(Br*M_LYlFenW>41k)?@IiV=`wZkTGAmS|y~YGRg{l$Mw>*^p7qbYa=K^rX`a z=dPW2w3)GSNnUAA&XG0U9!^4HO3L-3!r>Q!uJeDpBl`Ah=^N$Gr@p@z@^icxJb5#t qmW)L1DxbvSlF)*b#FEtGJgf{rkQuT+M5f~Y^T|IMomh(Od|3dhDNK0) delta 191 zcmdnbvY%yw29H7L{SH;pBP^Z827D7uj0LmwYl2@9Ob7alGr_VF8KQz_^{)l^-{%K#_;!?}`lfup4R6f4exZ1nv@Z`;m rS~BAISNS9smxLCiB$lKe=V4_4g3OS)GdVvj7oPl+(TU~vk%g@Qu&Ggl 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 b41effe7700f8924fd14840130d124cacdd8012f..c4e7f64cd6f30b3c1bf9f80c63b08bc537f5aae8 100644 GIT binary patch delta 177 zcmdnbvY%yw29Je7{+}Q7j5}_7^N5iIp&6`hG~fw=BXxTiAiaRDU%}@^>mwpwh1#fF3Bs+$vLv7 z+rvpnOi8(3R5<)X&~^TAcSPTQEq$Z>`PBFKLVk`HgC}oh)RK|NUFDNlToPK4l30>@ boQIVG2r@(Vhsadie?IvqqZ3P!oi7UjL1sqP delta 177 zcmdnbvY%yw29H7L{fHZdM_8_C9FLf2Vk}_v{j1d*DVN7fCupb!-z^iISYFQtQ8V$6 zje@DANwQJ0xk0i;Vp@uksfB5>iCJQzVXCQ_g;8>Hit*$KMm^o^f0LFmHZI94&B-~k z=HJuj8QC8iYXX17y-feKFK%(E<@`zE=5Hz=Uu#_L-E?^JW=1U;@%yWM5{pYh3sMqG dQjhbnG5|ql$lRHnAC?PG{>kXX^83ibRsaEOOmYAK diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java index e254394..cc0c213 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java @@ -406,7 +406,7 @@ public class MartialScheduleArrangeServiceImpl implements IMartialScheduleArrang String projectName = project.getProjectName(); group.setGroupName(projectName + " " + (first.getCategory() != null ? first.getCategory() : "未分组")); group.setProjectId(first.getProjectId()); - group.setProjectType(project.getType() == 3 ? 2 : 1); // type=3映射为projectType=2(集体) + group.setProjectType((project.getType() == 2 || project.getType() == 3) ? 2 : 1); // type=2(双人)或type=3(集体)映射为projectType=2(集体) group.setDisplayOrder(displayOrder++); group.setTotalParticipants(members.size()); group.setTotalTeams((int) teamCount);