老师确认增加群组

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

@@ -129,14 +129,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (months != null && months.size() > 0) {
             musicGroupPaymentCalenderDao.batchAdd(months,musicGroupId);
         }
-        // 保存乐团声部规划
-        if (musicGroupSubjectPlans != null) {
-            musicGroupSubjectPlanDao.batchAdd(musicGroupSubjectPlans,musicGroupId);
-        }
-//        musicGroupSubjectPlans.forEach(e -> {
-//            e.setMusicGroupId(musicGroupId);
-//            musicGroupSubjectPlanDao.insert(e);
-//        });
+
         //乐团科目学生
         if (subjectRegisters != null) {
             List<StudentRegistration> studentRegistrationList = new ArrayList<>();
@@ -152,9 +145,25 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     studentRegistration.setActualSubjectId(e.getSubjectId());
                 }
                 studentRegistrationList.addAll(musicGroupStudentRegistrationList);
+
+                for (MusicGroupSubjectPlan musicGroupSubjectPlan : musicGroupSubjectPlans) {
+                    if(!musicGroupSubjectPlan.getSubjectId().equals(e.getSubjectId())) continue;
+                    musicGroupSubjectPlan.setExpectedStudentNum(e.getRegisterIdList().size());
+                    musicGroupSubjectPlan.setApplyStudentNum(e.getRegisterIdList().size());
+                }
             });
             studentRegistrationService.batchInsert(studentRegistrationList);
         }
+
+        // 保存乐团声部规划
+        if (musicGroupSubjectPlans != null) {
+            musicGroupSubjectPlanDao.batchAdd(musicGroupSubjectPlans,musicGroupId);
+        }
+//        musicGroupSubjectPlans.forEach(e -> {
+//            e.setMusicGroupId(musicGroupId);
+//            musicGroupSubjectPlanDao.insert(e);
+//        });
+
         // 保存乐团声部商品规划
         if (musicGroupSubjectGoodsGroups != null) {
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups,musicGroupId);