修改bug

puzhibing

2024-03-15 b3e0d0ea6c1e311566bab861b79cc9b9c6d25287

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

@@ -121,33 +121,34 @@
            participantVo.setIdcard(participant.getIdcard());
            Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
            participantVo.setAge(age);
            Student student = studentClient.queryStudentByPhone(participant.getPhone() == null ? "0" : participant.getPhone());

            Student student = null;
            if(ToolUtil.isNotEmpty(participant.getPhone())){
                student = studentClient.queryStudentByPhone(participant.getPhone());
            }
            //设为不是学员
            participantVo.setIsStudent(0);

            if (null != student) {
                Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
                participantVo.setResidueClassHour(integer);

            } else {
                participantVo.setResidueClassHour(0);
            }
            participantVo.setPhone(participant.getPhone());
            participantVo.setHeight(participant.getHeight());
            participantVo.setWeight(participant.getWeight());
            participantVo.setHeadImg(participant.getHeadImg());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            if (null != participant.getBirthday()) {
                String format = sdf.format(participant.getBirthday());
                participantVo.setBirthday(format);
            }
            participantVo.setGender(participant.getGender());
            if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
                listVo1.add(participantVo);
                continue;
            }
            linkedHashMap.put(participant.getIdcard(), participantVo);

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

        for (TStudent tStudent : tStudents) {
@@ -162,6 +163,7 @@
            participantVo.setPhone(tStudent.getPhone());
            participantVo.setHeight(tStudent.getHeight().intValue());
            participantVo.setWeight(tStudent.getWeight());
            participantVo.setHeadImg(tStudent.getHeadImg());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            if (null != tStudent.getBirthday()) {
                String format = sdf.format(tStudent.getBirthday());
@@ -169,20 +171,13 @@
            }
            participantVo.setGender(tStudent.getSex());
            participantVo.setIsStudent(1);
            if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
                listVo1.add(participantVo);
                continue;
            }
            linkedHashMap.put(tStudent.getIdCard(), participantVo);
//            if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
//                listVo1.add(participantVo);
//                continue;
//            }
            linkedHashMap.put(tStudent.getName(), participantVo);
        }


        listVo1.addAll(linkedHashMap.values());


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


        return listVo1;
    }

@@ -213,6 +208,7 @@
        participant.setGender(editParticipant.getGender());
        participant.setIdcard(editParticipant.getIdcard());
        participant.setName(editParticipant.getName());
        participant.setHeadImg(editParticipant.getHeadImg());
        if (ToolUtil.isNotEmpty(editParticipant.getBirthday())) {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            participant.setBirthday(sdf.parse(editParticipant.getBirthday()));