add 乐团学生列表增加，声部更换详情

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.PaymentFlagEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -95,6 +96,9 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "备注信息",required = false)
     private String remark;
 
+    @ApiModelProperty(value = "声部更换详情",required = false)
+    private SubjectChange subjectChange;
+
     public String getCarePackageStr() {
         return carePackageStr;
     }
@@ -358,4 +362,12 @@ public class MusicGroupStudentsDto{
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public SubjectChange getSubjectChange() {
+        return subjectChange;
+    }
+
+    public void setSubjectChange(SubjectChange subjectChange) {
+        this.subjectChange = subjectChange;
+    }
 }

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

@@ -10,9 +10,7 @@ import java.util.stream.Collectors;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
-import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.SysConfigService;
 
@@ -48,7 +46,6 @@ import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.service.StudentManageService;
 import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -497,9 +494,14 @@ public class StudentManageServiceImpl implements StudentManageService {
             }
             List<Integer> collect = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toList());
             List<Integer> hasCourseStudent = courseScheduleDao.findHasCourseStudent(collect,"VIP,PRACTICE");
+            List<SubjectChange> waitPayChange = subjectChangeDao.getMusicGroupWaitPay(queryInfo.getMusicGroupId());
+            Map<Integer, List<SubjectChange>> studentWaitPayChange = waitPayChange.stream().collect(Collectors.groupingBy(SubjectChange::getStudentId));
             dataList.forEach(e->{
                 e.setHasCourse(hasCourseStudent.contains(e.getUserId()));
                 e.setNoPaymentAmount(totalAmountMap.get(e.getUserId()));
+                if (studentWaitPayChange.containsKey(e.getUserId())) {
+                    e.setSubjectChange(studentWaitPayChange.get(e.getUserId()).get(0));
+                }
             });
         }
         if (count == 0) {