Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherMapperDao.java

@@ -24,5 +24,5 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param ClassGroupList
      * @return
      */
-    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("ClassGroupList") List ClassGroupList);
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List classGroupList);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDefaultMusicGroupSalaryDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
 
 import org.apache.ibatis.annotations.Param;
@@ -13,9 +14,10 @@ public interface TeacherDefaultMusicGroupSalaryDao extends BaseDAO<Long, Teacher
 
     /**
      * 获取老师对应课程类型的课酬
+     *
      * @param userId
      * @param classGroupType
      * @return
      */
-    TeacherDefaultMusicGroupSalary getTeacherSalaryByUserIdAndType(@Param("userId") int userId, @Param("classGroupType") ClassGroupTypeEnum classGroupType);
+    List<TeacherDefaultMusicGroupSalary> getTeacherSalaryByUserIdAndType(@Param("userId") int userId, @Param("classGroupType") ClassGroupTypeEnum classGroupType, @Param("settlementType") SalarySettlementTypeEnum settlementType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupStudentMapper.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.Date;
+
 /**
  * 对应数据库表(class_group_student_mapper):
  */
@@ -29,6 +31,15 @@ public class ClassGroupStudentMapper {
 	/**  */
 	private java.util.Date createTime;
 
+	public ClassGroupStudentMapper() {
+	}
+
+	public ClassGroupStudentMapper(int classGroupId, Integer userId) {
+		this.classGroupId = classGroupId;
+		this.userId = userId;
+		this.status = ClassGroupStudentStatusEnum.NORMAL;
+	}
+
 	public ClassGroupStudentStatusEnum getStatus() {
 		return status;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupTeacherMapper.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 对应数据库表(class_group_teacher_mapper):
@@ -33,11 +34,14 @@ public class ClassGroupTeacherMapper {
 	private Integer userId;
 
 	@ApiModelProperty(value = "用户名",required = false)
-	private Integer realName;
+	private String realName;
 
 	/** 薪酬 */
 	@ApiModelProperty(value = "薪酬",required = false)
 	private BigDecimal salary;
+
+	@ApiModelProperty(value = "默认薪酬列表",required = false)
+	private List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaryList;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -109,13 +113,21 @@ public class ClassGroupTeacherMapper {
 		return this.updateTime;
 	}
 
-	public Integer getUserName() {
+	public String getUserName() {
 		return realName;
 	}
 
-	public void setUserName(Integer realName) {
+	public void setUserName(String realName) {
 		this.realName = realName;
 	}
+
+	public List<TeacherDefaultMusicGroupSalary> getTeacherDefaultMusicGroupSalaryList() {
+		return teacherDefaultMusicGroupSalaryList;
+	}
+
+	public void setTeacherDefaultMusicGroupSalaryList(List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaryList) {
+		this.teacherDefaultMusicGroupSalaryList = teacherDefaultMusicGroupSalaryList;
+	}
 			
 	@Override
 	public String toString() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -39,7 +39,7 @@ public class MusicGroupStudentFee {
 
 	/**  */
 	@ApiModelProperty(value = "乐团编号", required = false)
-	private Integer musicGroupId;
+	private String musicGroupId;
 
 	/**  */
 	@ApiModelProperty(value = "用户编号", required = false)
@@ -73,6 +73,20 @@ public class MusicGroupStudentFee {
 	/**  */
 	private java.util.Date updateTime;
 
+	public MusicGroupStudentFee(String musicGroupId, Integer userId, Integer subjectId, BigDecimal courseFee, Date nextPaymentDate, Integer continuousAbsenteeismTimes, BigDecimal temporaryCourseFee) {
+		this.musicGroupId = musicGroupId;
+		this.userId = userId;
+		this.subjectId = subjectId;
+		this.courseFee = courseFee;
+		this.nextPaymentDate = nextPaymentDate;
+		this.continuousAbsenteeismTimes = continuousAbsenteeismTimes;
+		this.temporaryCourseFee = temporaryCourseFee;
+		this.paymentStatus = PaymentStatus.NON_PAYMENT;
+	}
+
+	public MusicGroupStudentFee() {
+	}
+
 	public Date getNextPaymentDate() {
 		return nextPaymentDate;
 	}
@@ -97,11 +111,11 @@ public class MusicGroupStudentFee {
 		return this.id;
 	}
 
-	public void setMusicGroupId(Integer musicGroupId) {
+	public void setMusicGroupId(String musicGroupId) {
 		this.musicGroupId = musicGroupId;
 	}
 
-	public Integer getMusicGroupId() {
+	public String getMusicGroupId() {
 		return this.musicGroupId;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(student_registration):
  */
@@ -75,6 +77,17 @@ public class StudentRegistration {
     @ApiModelProperty(value = "班级id", hidden = true)
     private Integer ClassGroupId;
 
+    @ApiModelProperty(value = "零时课程费用", hidden = true)
+    private BigDecimal temporaryCourseFee;
+
+    public BigDecimal getTemporaryCourseFee() {
+        return temporaryCourseFee;
+    }
+
+    public void setTemporaryCourseFee(BigDecimal temporaryCourseFee) {
+        this.temporaryCourseFee = temporaryCourseFee;
+    }
+
     public Integer getActualSubjectId() {
         return actualSubjectId;
     }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
@@ -15,7 +16,7 @@ public interface TeacherDefaultMusicGroupSalaryService extends BaseService<Long,
      * @param classGroupType
      * @return
      */
-    TeacherDefaultMusicGroupSalary getTeacherSalaryByUserIdAndType(int userId,ClassGroupTypeEnum classGroupType);
+    List<TeacherDefaultMusicGroupSalary> getTeacherSalaryByUserIdAndType(int userId, ClassGroupTypeEnum classGroupType, SalarySettlementTypeEnum settlementType);
 
     /**
      * 批量新增修改教师薪酬设置

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

@@ -185,13 +185,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             Long classGroupId = this.insert(highClassGroup);
 
             //2、插入班级关联老师
-            TeacherDefaultMusicGroupSalary teacherSalary = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(highClassGroup.getUserId(), ClassGroupTypeEnum.HIGH);
             ClassGroupTeacherMapper classGroupTeacherMapper = new ClassGroupTeacherMapper();
             classGroupTeacherMapper.setMusicGroupId(highClassGroup.getUserId());
             classGroupTeacherMapper.setClassGroupId(classGroupId.intValue());
             classGroupTeacherMapper.setTeacherRole(TeachTypeEnum.BISHOP);
             classGroupTeacherMapper.setUserId(highClassGroup.getUserId());
-            classGroupTeacherMapper.setSalary(teacherSalary.getMainTeacherSalary());
             classGroupTeacherMapper.setCreateTime(date);
             classGroupTeacherMapper.setUpdateTime(date);
             classGroupTeacherMapperService.insert(classGroupTeacherMapper);
@@ -282,60 +280,19 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(String musicGroupId,SalarySettlementTypeEnum type) {
+    public List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type) {
         //乐团班级及班级老师
         List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId);
-        //乐团的课程计划
-        List<CourseSchedule> classGroupCourseSchedules = courseScheduleService.findClassGroupCourseSchedules(classGroupAndTeachers);
 
-        //获取乐团老师课酬
-        List<ClassGroupTeacherSalary> nowClassGroupTeacherSalaryList = classGroupTeacherSalaryService.findByMusicGroupId(musicGroupId);
-
-        //基础课时
-        BigDecimal baseDuration = new BigDecimal("30");
         for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
-
-            Set<Long> courseScheduleDurationSet = new HashSet<>();
-            for (CourseSchedule classGroupCourseSchedule : classGroupCourseSchedules) {
-                if (classGroupCourseSchedule.getClassGroupId().equals(classGroupAndTeacher.getId())) {
-                    //课程时长
-                    long duration = (classGroupCourseSchedule.getEndClassTime().getTime() - classGroupCourseSchedule.getStartClassTime().getTime()) / (1000 * 60);
-                    courseScheduleDurationSet.add(duration);
-                }
-            }
-
-            //获取教师列表
+            //班级的教师列表
             List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupAndTeacher.getClassGroupTeacherMapperList();
-
-            ArrayList<ClassGroupTeacherSalary> classGroupTeacherSalaryList = new ArrayList<>();
-            for (Long duration : courseScheduleDurationSet) {
-                THREE:
-                for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
-
-                    //已经设置跳过计算
-                    for (ClassGroupTeacherSalary classGroupTeacherSalary : nowClassGroupTeacherSalaryList) {
-                        if (classGroupTeacherMapper.getClassGroupId().equals(classGroupTeacherSalary.getClassGroupId()) &&
-                                classGroupTeacherMapper.getUserId().equals(classGroupTeacherSalary.getUserId()) &&
-                                classGroupTeacherSalary.getDuration().equals(duration)
-                        ) {
-                            classGroupTeacherSalaryList.add(classGroupTeacherSalary);
-                            continue THREE;
-                        }
-                    }
-
-                    ClassGroupTeacherSalary classGroupTeacherSalary = new ClassGroupTeacherSalary();
-                    classGroupTeacherSalary.setMusicGroupId(classGroupTeacherMapper.getMusicGroupId());
-                    classGroupTeacherSalary.setClassGroupId(classGroupTeacherMapper.getClassGroupId());
-                    classGroupTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
-                    classGroupTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
-                    classGroupTeacherSalary.setDuration(duration.intValue());
-                    BigDecimal salary = new BigDecimal(duration).divide(baseDuration).multiply(classGroupTeacherMapper.getSalary()).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    classGroupTeacherSalary.setSalary(salary);
-                    classGroupTeacherSalaryList.add(classGroupTeacherSalary);
-                }
+            for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+                //获取老师的默认课酬
+                List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), classGroupAndTeacher.getType(), type);
+                classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
             }
-            //教师课酬列表
-            classGroupAndTeacher.setClassGroupTeacherSalaryList(classGroupTeacherSalaryList);
+
         }
         return classGroupAndTeachers;
     }
@@ -364,7 +321,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId, e.getMusicGroupId());
 //                    if (musicGroupStudentFee != null) {
 //                        int i = DateUtil.daysBetween(new Date(), musicGroupStudentFee.getNextPaymentDate());
-                        e.setPaymentStatus(musicGroupStudentFee.getPaymentStatus());
+                    e.setPaymentStatus(musicGroupStudentFee.getPaymentStatus());
 //                    }
                 }
             });
@@ -384,7 +341,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         List<ImGroupModel> imGroupModels1 = classGroupDao.queryUserGroups(userId, search);
 
-        if(imGroupModels != null && imGroupModels.size() > 0){
+        if (imGroupModels != null && imGroupModels.size() > 0) {
             List<MusicGroup> musicGroups = musicGroupDao.queryListByIds(musicGroupIds);
 
             List<Map<String, Integer>> musicGroupUserNums = musicGroupDao.countMusicGroupUserNum(musicGroupIds);
@@ -404,10 +361,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 e.setCount(musicGroupUserNumMap.get(e.getId()) + teachers.size());
                 e.setId("mg" + e.getId());
             });
-        }else {
+        } else {
             imGroupModels = new ArrayList<>();
         }
-        if(imGroupModels1 != null && imGroupModels1.size() > 0){
+        if (imGroupModels1 != null && imGroupModels1.size() > 0) {
             imGroupModels1.forEach(e -> {
                 //获取当前班级老师总数
                 Set<Integer> teachers = classGroupDao.queryTeacherIds(e.getId());

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

@@ -1,22 +1,19 @@
 package com.ym.mec.biz.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
-import com.ym.mec.biz.dal.dao.SubjectDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.auth.api.entity.SysMenu;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.im.ImFeignService;
+import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +22,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.UserLockFlag;
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDto;
 import com.ym.mec.biz.dal.dto.StudentInfo;
@@ -55,6 +51,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private TeacherDao teacherDao;
     @Autowired
+    private ClassGroupDao classGroupDao;
+    @Autowired
+    private ClassGroupStudentMapperDao classGroupStudentMapperDao;
+    @Autowired
+    private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
+    @Autowired
+    private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    @Autowired
+    private MusicGroupSubjectPlanDao musicGroupSubjectPlanDao;
+    @Autowired
     private SubjectDao subjectDao;
     @Autowired
     private ImFeignService imFeignService;
@@ -356,6 +362,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             throw new Exception("该学员已存在");
         }else {
             SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
+            Integer userId;
             if(sysUser == null){
                 //新增user
                 sysUser = new SysUser();
@@ -364,18 +371,55 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setGender(studentRegistration.getGender());
                 sysUser.setUserType(SysUserType.STUDENT);
                 teacherDao.addSysUser(sysUser);
+                userId = sysUser.getId();
                 //注册到融云
-                ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), sysUser.getAvatar()));
+                ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
                 sysUser.setImToken(register.getToken());
                 teacherDao.updateUser(sysUser);
+            }else {
+                userId = sysUser.getId();
             }
+            studentRegistration.setUserId(userId);
             //学生报名表
             studentRegistrationDao.insert(studentRegistration);
-            //学生注册
-            //缴费金额
-            //学员加入的金额
+            if(studentRegistration.getClassGroupId() != null){
+                ClassGroup classGroup = classGroupDao.get(studentRegistration.getClassGroupId());
+                if(classGroup != null){
+                    if(classGroup.getMusicGroupId().equals(studentRegistration.getMusicGroupId())){
+                        throw new Exception("班级录入错误");
+                    }else {
+                        //修改实际学生人数
+                        classGroup.setStudentNum(classGroup.getStudentNum() + 1);
+                        classGroup.setUpdateTime(new Date());
+                        classGroupDao.update(classGroup);
+                    }
+                }else {
+                    throw new Exception("班级不存在");
+                }
+                //新增班级学生关系
+                classGroupStudentMapperDao.insert(new ClassGroupStudentMapper(studentRegistration.getClassGroupId(),userId));
+                //乐团学生费用表
+                MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
+                //获取当前月
+                Integer month = Integer.parseInt(DateUtil.getMonth(new Date()));
+                //获取下次缴费月份
+                List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByMusicGroupId(studentRegistration.getMusicGroupId());
+                List<Integer> months = musicGroupPaymentCalenders.stream().map(e -> e.getPaymentMonth()).collect(Collectors.toList());
+                for (int i = 0;i<months.size();i++){
+                    if(months.get(i).equals(month)){
+                        month = i == months.size()-1?months.get(0):months.get(i+1);
+                    }
+                }
+                Calendar calendar = Calendar.getInstance();
+                calendar.add(Calendar.MONTH, month);
+                DateUtil.getFirstDayOfMonth(calendar.getTime());
+                //保存乐团学生费用表
+                musicGroupStudentFeeDao.insert(new MusicGroupStudentFee(studentRegistration.getMusicGroupId(),
+                        userId,studentRegistration.getSubjectId(),musicOneSubjectClassPlan.getFee(),
+                        DateUtil.getFirstDayOfMonth(calendar.getTime()),0,studentRegistration.getTemporaryCourseFee()));
+            }
+            return userId;
         }
-        return null;
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,8 +27,8 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 	}
 
 	@Override
-    public TeacherDefaultMusicGroupSalary getTeacherSalaryByUserIdAndType(int userId,ClassGroupTypeEnum classGroupType) {
-        return teacherDefaultMusicGroupSalaryDao.getTeacherSalaryByUserIdAndType(userId, classGroupType);
+    public List<TeacherDefaultMusicGroupSalary> getTeacherSalaryByUserIdAndType(int userId, ClassGroupTypeEnum classGroupType, SalarySettlementTypeEnum settlementType) {
+        return teacherDefaultMusicGroupSalaryDao.getTeacherSalaryByUserIdAndType(userId, classGroupType,settlementType);
     }
 
 	@Override

mec-biz/src/main/resources/config/mybatis/ClassGroupTeacherMapperMapper.xml

@@ -105,7 +105,7 @@
         FROM sys_user u,
         class_group_teacher_mapper ct
         WHERE u.id_=ct.user_id_ AND ct.class_group_id_ IN
-        <foreach collection="ClassGroupList" item="item" index="index" open="(" close=")" separator=",">
+        <foreach collection="classGroupList" item="item" index="index" open="(" close=")" separator=",">
             #{item.id}
         </foreach>
     </select>

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -73,6 +73,8 @@
 		SELECT COUNT(*) FROM music_group_payment_calender
 	</select>
     <select id="findByMusicGroupId" resultMap="MusicGroupPaymentCalender">
-        SELECT * FROM music_group_payment_calender mgpc WHERE music_group_id_ = #{musicGroupId}
+        SELECT * FROM music_group_payment_calender mgpc
+        WHERE music_group_id_ = #{musicGroupId}
+        ORDER BY payment_month_
     </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/TeacherDefaultMusicGroupSalaryMapper.xml

@@ -93,6 +93,6 @@
 
 	<!-- 根据user_id 获取老师的默认薪酬 -->
 	<select id="getTeacherSalaryByUserIdAndType" resultMap="TeacherDefaultMusicGroupSalary">
-		SELECT * FROM teacher_default_music_group_salary WHERE user_id_=#{userId} AND course_schedule_type_ = #{courseScheduleType}
+		SELECT * FROM teacher_default_music_group_salary WHERE user_id_=#{userId} AND course_schedule_type_ = #{classGroupType} AND settlement_type_ = #{settlementType}
 	</select>
 </mapper>

mec-common/common-core/src/main/java/com/ym/mec/common/config/LocalFastJsonHttpMessageConverter.java

@@ -17,7 +17,7 @@ import com.ym.mec.util.json.JsonUtil;
 
 public class LocalFastJsonHttpMessageConverter extends FastJsonHttpMessageConverter {
 
-	private static final String FORMAT = "yyyy-MM-dd HH:mm:ss SSS";
+	private static final String FORMAT = "yyyy-MM-dd HH:mm:ss";
 
 	@Override
 	protected void writeInternal(Object obj, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException {

mec-web/src/main/java/com/ym/mec/web/controller/StudentRegistrationController.java

@@ -32,16 +32,15 @@ public class StudentRegistrationController extends BaseController {
     @ApiOperation(value = "乐团添加学员")
     @PostMapping("/insertStudent")
     public Object add(StudentRegistration studentRegistration) throws Exception {
-        studentRegistrationService.insertStudent(studentRegistration);
-        return succeed();
+        return succeed(studentRegistrationService.insertStudent(studentRegistration));
     }
 
-    @ApiOperation(value = "删除学生报名信息")
-    @PostMapping("/del/{id}")
-    public Object del(@ApiParam(value = "学生报名信息编号", required = true) @PathVariable("id") Long id) {
-        studentRegistrationService.delete(id);
-        return succeed();
-    }
+//    @ApiOperation(value = "删除学生报名信息")
+//    @PostMapping("/del")
+//    public Object del(@ApiParam(value = "学生报名信息编号", required = true) @PathVariable("id") Long id) {
+//        studentRegistrationService.delete(id);
+//        return succeed();
+//    }
 
     @ApiOperation(value = "修改学生报名信息")
     @PostMapping("/update")