From 197431f6ce578d87a0156d2b8b13f1d327ba5e1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 30 一月 2024 14:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 1ad835f..c234472 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -835,30 +835,9 @@
@Resource
private StudentClient studentClient;
@PostMapping("/base/competition/getPeopleFromId1")
- public List<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery) {
+ public Page<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery) {
try {
- Page<UserCompetition> participantPage = new Page<>(getPeopleQuery.getOffset(), getPeopleQuery.getLimit());
- List<CompetitionUser> page = participantService.getPeopleFromId1(participantPage, getPeopleQuery.getId(), getPeopleQuery.getState());
-
- List<CompetitionUser> users = new ArrayList<>();
- List<UserCompetition> coms = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("competitionId", getPeopleQuery.getId()));
- for (UserCompetition com : coms) {
- int number = com.getParticipantId();
- String numberString = Integer.toString(number);
- int digitCount = numberString.length();
- if (digitCount!=9){
- TStudent tStudent = studentClient.queryById(number);
- CompetitionUser competitionUser = new CompetitionUser();
- competitionUser.setName(tStudent.getName());
- competitionUser.setPhone(tStudent.getPhone());
- competitionUser.setSex(tStudent.getSex());
- competitionUser.setIdCard(tStudent.getIdCard());
- competitionUser.setState(tStudent.getState());
- users.add(competitionUser);
- }
- }
- page.addAll(users);
-
+ Page<CompetitionUser> page = participantService.getPeopleFromId1(getPeopleQuery.getOffset(), getPeopleQuery.getLimit(), getPeopleQuery.getId(), getPeopleQuery.getState());
return page;
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.7.1