跨团合班

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

@@ -1,8 +1,8 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -17,6 +17,17 @@ public class MusicGroupPaymentCalenderAuditDetailDto {
     @ApiModelProperty(value = "缴费周期列表",required = false)
     private List<MusicGroupPaymentCalender> musicGroupPaymentCalenders;
 
+    @ApiModelProperty(value = "学员缴费详情",required = false)
+    private List<MusicGroupPaymentCalenderStudentDetail> musicGroupPaymentCalenderStudentDetails;
+
+    public List<MusicGroupPaymentCalenderStudentDetail> getMusicGroupPaymentCalenderStudentDetails() {
+        return musicGroupPaymentCalenderStudentDetails;
+    }
+
+    public void setMusicGroupPaymentCalenderStudentDetails(List<MusicGroupPaymentCalenderStudentDetail> musicGroupPaymentCalenderStudentDetails) {
+        this.musicGroupPaymentCalenderStudentDetails = musicGroupPaymentCalenderStudentDetails;
+    }
+
     public List<MusicGroupPaymentCalender> getMusicGroupPaymentCalenders() {
         return musicGroupPaymentCalenders;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderService.java

@@ -95,7 +95,7 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @author zouxuan
 	 * @date 2020/10/30
 	 * @time 15:10
-	 * @param calenderId:
+	 * @param batchNo:
 	 * @return com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto
 	 */
 	MusicGroupPaymentCalenderAuditDetailDto auditListDetail(String batchNo);

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

@@ -939,6 +939,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		//获取缴费周期
 		List<MusicGroupPaymentCalender> groupPaymentCalenders = musicGroupPaymentCalenderDao.findByBatchNo(batchNo);
 		calenderAuditDetailDto.setMusicGroupPaymentCalenders(groupPaymentCalenders);
+		//获取跨团合班学员缴费详情
+		calenderAuditDetailDto.setMusicGroupPaymentCalenderStudentDetails(musicGroupPaymentCalenderStudentDetailDao.findByBatchNo(batchNo));
 		return calenderAuditDetailDto;
 	}