fix：教师端点名列表被合并学员

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentAttendanceViewDto.java

@@ -45,6 +45,16 @@ public class StudentAttendanceViewDto {
     @ApiModelProperty(value = "学生在学状态",required = false)
     private StudentAttendanceStatusEnum status;
 
+    private Boolean beMerged;
+
+    public Boolean getBeMerged() {
+        return beMerged;
+    }
+
+    public void setBeMerged(Boolean beMerged) {
+        this.beMerged = beMerged;
+    }
+
     public String getPaymentStatus() {
         return paymentStatus;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1730,8 +1730,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 List<Map<Integer, Long>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
                 Map<Integer, Long> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
                 truantStudent.forEach(studentAttendanceViewDto -> {
-                    studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
-                    studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                   if(studentAttendanceViewDto.getBeMerged()){
+                       studentAttendanceViewDto.setSubjectName("被合并学员");
+                   }else{
+                       studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                       studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                   }
                 });
             } else if (schedule.getGroupType() != MUSIC) {
                 ClassGroup classGroup = classGroupDao.get(schedule.getClassGroupId());

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -196,6 +196,7 @@
             cssp.user_id_ student_id_,
             su.username_,
             su.avatar_,
+            cssp.be_merged_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp

mec-biz/src/main/resources/config/mybatis/StudentAttendanceMapper.xml

@@ -222,6 +222,7 @@
         <result property="subjectName" column="subject_name_"/>
         <result property="avatar" column="avatar_"/>
         <result property="phone" column="phone_"/>
+        <result property="beMerged" column="be_merged_"/>
         <result property="status" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>