diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index e34da13..7b70dcc 100644 Binary files a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta and b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta differ 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 4b1f247..8c6bf7a 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta differ 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 9b3e58f..966512b 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index 3173db0..08266bb 100644 Binary files a/minio_data/.minio.sys/buckets/.usage.json/xl.meta and b/minio_data/.minio.sys/buckets/.usage.json/xl.meta differ 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 18aaa3f..ecb413f 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta differ 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 89fa61a..563925b 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta differ 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 be4d75b..321100a 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta differ 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 5969893..a87a6ed 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta differ diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialCompetitionController.java b/src/main/java/org/springblade/modules/martial/controller/MartialCompetitionController.java index 742d652..0b0d36e 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialCompetitionController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialCompetitionController.java @@ -15,6 +15,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.modules.martial.pojo.entity.MartialAthlete; import org.springblade.modules.martial.pojo.entity.MartialCompetition; import org.springblade.modules.martial.service.IMartialAthleteService; +import org.springblade.modules.martial.mapper.MartialAthleteMapper; import org.springblade.modules.martial.service.IMartialCompetitionService; import org.springblade.modules.system.pojo.entity.User; import org.springframework.web.bind.annotation.*; @@ -43,11 +44,9 @@ public class MartialCompetitionController extends BladeController { public R 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