Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2024-01-30 197431f6ce578d87a0156d2b8b13f1d327ba5e1e

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.Student;
@@ -16,16 +17,20 @@
import com.dsh.competition.model.ParticipantVo;
import com.dsh.competition.model.SaveParticipant;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.IPaymentCompetitionService;
import com.dsh.competition.service.UserCompetitionService;
import com.dsh.competition.util.CodeGenerateUtils;
import com.dsh.competition.util.JuHeUtil;
import com.dsh.competition.util.ResultUtil;
import com.dsh.competition.util.ToolUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -39,6 +44,12 @@

    @Resource
    private StudentClient studentClient;

    @Autowired
    private UserCompetitionService userCompetitionService;

    @Autowired
    private IPaymentCompetitionService paymentCompetitionService;


    /**
@@ -268,8 +279,36 @@
        return this.baseMapper.getPeopleFromId(participantPage, id, state);
    }
    @Override
    public  List<CompetitionUser> getPeopleFromId1(Page<UserCompetition> participantPage, Integer id, Integer state) {
        return this.baseMapper.getPeopleFromId1(participantPage, id, state);
    public  Page<CompetitionUser> getPeopleFromId1(long offset, long limit, Integer id, Integer state) {
        List<UserCompetition> peopleFromId1 = this.baseMapper.getPeopleFromId1(id, state, offset, limit);
        int count = this.baseMapper.getPeopleFromIdCount(id, state);
        List<CompetitionUser> list = new ArrayList<>();
        for (UserCompetition userCompetition : peopleFromId1) {
            Long paymentCompetitionId = userCompetition.getPaymentCompetitionId();
            PaymentCompetition paymentCompetition = paymentCompetitionService.getById(paymentCompetitionId);
            Participant participant = this.getById(userCompetition.getParticipantId());
            CompetitionUser competitionUser = new CompetitionUser();
            if(null != participant){
                competitionUser.setName(participant.getName());
                competitionUser.setSex(participant.getGender());
                competitionUser.setPhone(participant.getPhone());
                competitionUser.setIdCard(participant.getIdcard());
            }else{
                TStudent tStudent = studentClient.queryById(userCompetition.getParticipantId());
                competitionUser.setName(tStudent.getName());
                competitionUser.setSex(tStudent.getSex());
                competitionUser.setPhone(tStudent.getPhone());
                competitionUser.setIdCard(tStudent.getIdCard());
            }
            if(null != paymentCompetition){
                competitionUser.setState(paymentCompetition.getPayStatus());
            }
            list.add(competitionUser);
        }
        Page<CompetitionUser> page = new Page<>();
        page.setRecords(list);
        page.setTotal(count);
        return page;
    }

    @Override