|
|
@@ -32,6 +32,7 @@ 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.service.*;
|
|
|
+import com.ym.mec.util.collection.ListUtil;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -3725,6 +3726,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//是否有需要审核的缴费项目
|
|
|
//将学员加入新乐团、扣除原乐团剩余课程余额、补充到现有乐团
|
|
|
List<MusicGroupPaymentCalenderStudentDetail> calenderStudentDetails = paymentCalenderDto.getMusicGroupPaymentCalenderStudentDetails();
|
|
|
+
|
|
|
Map<Integer, List<MusicGroupPaymentCalenderStudentDetail>> collect = calenderStudentDetails.stream().collect(Collectors.groupingBy(e -> e.getUserId()));
|
|
|
for (Map<Integer, String> classGroupStudent : classGroupStudents) {
|
|
|
Integer classGroupId = classGroupStudent.keySet().iterator().next();
|
|
|
@@ -3733,7 +3735,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
paymentCalenderDto.setMusicGroupId(musicGroup.getId());
|
|
|
|
|
|
- boolean containsAll = musicGroupPaymentCalenderStudentDetails.containsAll(calenderStudentDetails);
|
|
|
+ boolean containsAll = ListUtil.isEquals(musicGroupPaymentCalenderStudentDetails,calenderStudentDetails);
|
|
|
if(!containsAll){
|
|
|
paymentCalenderDto.setStatus(AUDITING);
|
|
|
}else {
|
