Merge remote-tracking branch 'origin/master'

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

@@ -983,11 +983,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //3、将老师加入关联关系
         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
 
-        for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+        classGroupTeacherMapperList.forEach(classGroupTeacherMapper -> {
+            classGroupTeacherMapper.setGroupType(classGroup.getGroupType());
             classGroupTeacherMapper.setClassGroupId(classGroup.getId());
             classGroupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId());
             userIds.add(classGroupTeacherMapper.getUserId());
-        }
+        });
         classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList);
 
         //创建IM群组
@@ -1194,11 +1195,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //3、将老师加入关联关系
         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
 
-
-        for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+        classGroupTeacherMapperList.forEach(classGroupTeacherMapper -> {
+            classGroupTeacherMapper.setGroupType(classGroup.getGroupType());
             classGroupTeacherMapper.setClassGroupId(classGroup.getId());
             classGroupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId());
-        }
+        });
         classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList);
 
         //5、插入班级排课信息
@@ -1403,12 +1404,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //3、将老师加入关联关系
         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
 
-
-        for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+        classGroupTeacherMapperList.forEach(classGroupTeacherMapper -> {
+            classGroupTeacherMapper.setGroupType(classGroup.getGroupType());
             classGroupTeacherMapper.setClassGroupId(classGroup.getId());
             classGroupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId());
             userIds.add(classGroupTeacherMapper.getUserId());
-        }
+        });
         classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList);
 
         //创建IM群组

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

@@ -85,6 +85,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			studentAttendance.setTeacherId(sysUser.getId());
 			studentAttendance.setCurrentClassTimes(classTimes+1);
 			StudentAttendance studentAttendanceInfo = studentAttendanceDao.getStudentAttendanceInfo(studentAttendance);
+			studentAttendanceInfo.setGroupType(courseSchedule.getGroupType());
+			studentAttendanceInfo.setMusicGroupId(courseSchedule.getMusicGroupId());
 			if (studentAttendance.getStatus() != StudentAttendanceStatusEnum.DROP_OUT) {
 				//判断是否为连续旷课
 				if(StudentAttendanceStatusEnum.TRUANT.equals(studentAttendance.getStatus())
@@ -217,6 +219,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 		studentAttendance.setRemark(remark);
 		studentAttendance.setStatus(StudentAttendanceStatusEnum.LEAVE);
 		studentAttendance.setUserId(userId);
+		studentAttendance.setGroupType(courseSchedule.getGroupType());
+		studentAttendance.setMusicGroupId(courseSchedule.getMusicGroupId());
 
 		if(Objects.nonNull(studentAttendance.getId())){
 			studentAttendanceDao.update(studentAttendance);

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

@@ -69,7 +69,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			throw new BizException("请选择课程!");
 		}
 
-		ClassGroup classGroup = new ClassGroup();
 
 //		SysConfig byParamName = sysConfigService.findByParamName(SysConfigService.ADVANCE_SIGN_IN_MINUTES);
 //		Integer advanceSignInMinutes=Integer.parseInt(byParamName.getParanValue());
@@ -94,7 +93,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 		teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
-		teacherAttendance.setGroupType(classGroup.getGroupType());
+		teacherAttendance.setGroupType(teacherAttendance.getGroupType());
 		teacherAttendance.setRemark(teacherSignOutDto.getTeacherAttendanceInfo().getRemark());
 		int advanceSignMinutes = Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES));
 
@@ -102,7 +101,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		if(courseSchedule == null){
 			throw new BizException("课程信息不存在");
 		}
-		teacherAttendance.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(classGroup.getId()) + 1);
+		teacherAttendance.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(teacherAttendance.getClassGroupId()) + 1);
 		String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
 		String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
 		String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
@@ -173,7 +172,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
 			courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
 			courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
-			courseHomework.setGroupType(classGroup.getGroupType());
+			courseHomework.setGroupType(teacherAttendance.getGroupType());
 			courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
 			courseHomework.setExpectNum(studentAttendanceDao.countNormalAttendanceStudentNums(teacherAttendance.getCourseScheduleId()));
 			courseHomework.setExpiryDate(DateUtil.addDays(date,7));
@@ -283,6 +282,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					e.setTeacherId(userId);
 					e.setStatus(StudentAttendanceStatusEnum.TRUANT);
 					e.setRemark("学员未到，自动补旷课");
+					e.setMusicGroupId(courseSchedule.getMusicGroupId());
+					e.setGroupType(courseSchedule.getGroupType());
 				});
 				studentAttendanceDao.addStudentAttendances(studentAttendances);
 			}

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

@@ -77,7 +77,7 @@
         INSERT INTO class_group_student_mapper (group_type_,music_group_id_,class_group_id_,user_id_,status_,create_time_)
         VALUE
         <foreach collection="classGroupStudentMapperList" item="item" index="index" separator=",">
-            (#{item.groupType},#{item.musicGroupId},#{item.classGroupId},#{item.userId},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now())
+            (#{item.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.musicGroupId},#{item.classGroupId},#{item.userId},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now())
         </foreach>
     </insert>
     

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

@@ -97,10 +97,10 @@
     <!-- 批量插入班级老师 -->
     <insert id="classGroupTeachersInsert" parameterType="java.util.List">
         INSERT INTO class_group_teacher_mapper
-        (id_,music_group_id_,class_group_id_,teacher_role_,user_id_,salary_,create_time_,update_time_)
+        (id_,group_type_,music_group_id_,class_group_id_,teacher_role_,user_id_,salary_,create_time_,update_time_)
         VALUE
         <foreach collection="classGroupTeacherMapperList" item="item" index="index" separator=",">
-            (#{item.id},#{item.musicGroupId},#{item.classGroupId},#{item.teacherRole},#{item.userId},#{item.salary},NOW(),NOW())
+            (#{item.id},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.musicGroupId},#{item.classGroupId},#{item.teacherRole},#{item.userId},#{item.salary},NOW(),NOW())
         </foreach>
     </insert>
 

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

@@ -783,6 +783,8 @@
     <select id="findVipGroupCourseSchedules" resultMap="CourseSchedule">
         SELECT
             cs.id_,
+            cs.group_type_,
+            cs.music_group_id_,
             cs.class_group_id_,
             cs.status_,
             cs.subsidy_,

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

@@ -149,7 +149,7 @@
         <include refid="findStudentsByOrganIdSql"/>
     </select>
     <select id="findStudentBaseInfoByUserID" resultMap="studentManageListDto">
-        SELECT su.real_name_,su.gender_,su.birthdate_,sr.parents_name_,su.id_ user_id_,
+        SELECT su.username_ real_name_,su.gender_,su.birthdate_,sr.parents_name_,su.id_ user_id_,
         sr.parents_phone_,sr.current_class_,sr.current_grade_
         FROM sys_user su
         LEFT JOIN student_registration sr ON su.id_ = sr.user_id_