update

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

@@ -39,6 +39,9 @@ public class CourseListDto {
     @ApiModelProperty(value = "当前课次",required = true)
     private Integer currentClassTimes;
 
+    @ApiModelProperty(value = "剩余课时",required = true)
+    private Integer surplusClassTimes;
+
     @ApiModelProperty(value = "教师姓名",required = true)
     private String teacherName;
 
@@ -65,6 +68,14 @@ public class CourseListDto {
 
     private Integer isApply;
 
+    public Integer getSurplusClassTimes() {
+        return surplusClassTimes;
+    }
+
+    public void setSurplusClassTimes(Integer surplusClassTimes) {
+        this.surplusClassTimes = surplusClassTimes;
+    }
+
     public String getMusicId() {
         return musicId;
     }

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

@@ -600,12 +600,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         for (CourseListDto e:courseListDtos) {
             if(StringUtils.isEmpty(e.getMusicId())){
                 classTimes = vipCourseNumMap.get(e.getVipId());
-                e.setTotalClassTimes(classTimes == null?0:classTimes.intValue());
-                e.setCurrentClassTimes(0);
+                e.setSurplusClassTimes(classTimes == null?0:classTimes.intValue());
             }else {
                 classTimes = musicCourseNumMap.get(e.getMusicId());
-                e.setTotalClassTimes(classTimes == null?0:classTimes.intValue());
-                e.setCurrentClassTimes(0);
+                e.setSurplusClassTimes(classTimes == null?0:classTimes.intValue());
             }
             e.setAddress(schoolNames.get(e.getTeacherSchoolId()));
             e.setIsApply(isApplyMap.get(e.getMusicGroupId()));

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

@@ -482,6 +482,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             throw new Exception("该学员已存在");
         } else {
             SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
+            MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
             Integer userId;
             if (sysUser == null) {
                 //新增user
@@ -492,7 +493,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setGender(studentRegistration.getGender());
                 sysUser.setUserType(SysUserType.STUDENT);
                 sysUser.setIdCardNo(studentRegistration.getIdCardNo());
-                sysUser.setOrganId(studentRegistration.getOrganId());
+                sysUser.setOrganId(musicGroup.getOrganId().toString());
                 sysUser.setBirthdate(studentRegistration.getBirthdate());
                 teacherDao.addSysUser(sysUser);
                 userId = sysUser.getId();
@@ -512,7 +513,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setRealName(studentRegistration.getParentsName());
                 sysUser.setUsername(studentRegistration.getName());
                 sysUser.setGender(studentRegistration.getGender());
-                sysUser.setOrganId(studentRegistration.getOrganId());
+                sysUser.setOrganId(musicGroup.getOrganId().toString());
                 sysUser.setBirthdate(studentRegistration.getBirthdate());
                 teacherDao.updateUser(sysUser);
                 userId = sysUser.getId();
@@ -524,7 +525,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             studentRegistration.setTemporaryCourseFee(studentAddDto.getTemporaryCourseFee());
             //学生报名表
 
-            MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.OPERATION_EXECUTIVE);