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

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

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

@@ -16,6 +16,7 @@
import com.dsh.competition.model.ParticipantVo;
import com.dsh.competition.model.SaveParticipant;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.util.CodeGenerateUtils;
import com.dsh.competition.util.JuHeUtil;
import com.dsh.competition.util.ResultUtil;
import com.dsh.competition.util.ToolUtil;
@@ -71,6 +72,9 @@
            Date parse = sdf.parse(addParticipant.getBirthday());
            participant.setBirthday(parse);
        }
        String s = CodeGenerateUtils.generateOrderSn();
        String substring = s.substring(1);
        participant.setId(Integer.valueOf(substring));
        participant.setAppUserId(uid);
        participant.setState(1);
        participant.setInsertTime(new Date());
@@ -92,30 +96,12 @@
    public List<ParticipantVo> queryParticipantList(Integer uid) throws Exception {
        //拿到学员列表
        List<TStudent> tStudents = studentClient.queryStudentList(uid);

        List<ParticipantVo> listVo1 = new ArrayList<>();

        //利用HashMap去重身份证
        LinkedHashMap<String,ParticipantVo> linkedHashMap =new LinkedHashMap<>();
        SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
        for (TStudent tStudent : tStudents) {
            ParticipantVo participantVo = new ParticipantVo();
            participantVo.setId(tStudent.getId());
            participantVo.setName(tStudent.getName());
            participantVo.setIdcard(tStudent.getIdCard());
            Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
            participantVo.setAge(age);
            Integer integer = coursePackagePaymentClient.queryResidueClassHour(tStudent.getId());
            participantVo.setResidueClassHour(integer);
            participantVo.setPhone(tStudent.getPhone());
            participantVo.setHeight(tStudent.getHeight().intValue());
            participantVo.setWeight(tStudent.getWeight());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            if(null != tStudent.getBirthday()){
                String format = sdf.format(tStudent.getBirthday());
                participantVo.setBirthday(format);
            }
            participantVo.setGender(tStudent.getSex());
            participantVo.setIsStudent(1);
            linkedHashMap.put(tStudent.getIdCard(),participantVo);
        }



@@ -152,15 +138,47 @@
                participantVo.setBirthday(format);
            }
            participantVo.setGender(participant.getGender());

            if (participant.getIdcard()==null|| participant.getIdcard().isEmpty()){
                listVo1.add(participantVo);
                continue;
            }
            linkedHashMap.put(participant.getIdcard(),participantVo);
            listVo.add(participantVo);
//            listVo.add(participantVo);

        }

        for (TStudent tStudent : tStudents) {
            ParticipantVo participantVo = new ParticipantVo();
            participantVo.setId(tStudent.getId());
            participantVo.setName(tStudent.getName());
            participantVo.setIdcard(tStudent.getIdCard());
            Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
            participantVo.setAge(age);
            Integer integer = coursePackagePaymentClient.queryResidueClassHour(tStudent.getId());
            participantVo.setResidueClassHour(integer);
            participantVo.setPhone(tStudent.getPhone());
            participantVo.setHeight(tStudent.getHeight().intValue());
            participantVo.setWeight(tStudent.getWeight());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            if(null != tStudent.getBirthday()){
                String format = sdf.format(tStudent.getBirthday());
                participantVo.setBirthday(format);
            }
            participantVo.setGender(tStudent.getSex());
            participantVo.setIsStudent(1);
            if (tStudent.getIdCard()==null|| tStudent.getIdCard().isEmpty()){
                listVo1.add(participantVo);
                continue;
            }
            linkedHashMap.put(tStudent.getIdCard(),participantVo);
        }



        listVo1.addAll(linkedHashMap.values());

        List<ParticipantVo> listVo1 = new ArrayList<>(linkedHashMap.values());

//        List<ParticipantVo> listVo1 = new ArrayList<>(linkedHashMap.values());


        return listVo1;
@@ -253,4 +271,9 @@
    public Page<CompetitionUser> getPeopleFromId(Page<UserCompetition> participantPage, Integer id, Integer state) {
        return this.baseMapper.getPeopleFromId(participantPage,id,state);
    }

    @Override
    public List<CompetitionUser> getPeoples(Integer id, Integer state) {
        return this.baseMapper.getPeoples(id,state);
    }
}