系统收费

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

@@ -54,7 +54,8 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
      * 构建初始学生作业提交记录
      */
     List<StudentCourseHomework> constructInitialStudentHomeworkRecordsWithPayment(@Param("courseScheduleID") Long courseScheduleID,
-                                                                                  @Param("courseHomeworkID") Long courseHomeworkID);
+                                                                                  @Param("courseHomeworkID") Long courseHomeworkID,
+                                                                                  @Param("musicScoreId") Integer musicScoreId);
 
     /**
      * @param courseScheduleId: 作业编号

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

@@ -81,7 +81,7 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 			courseHomeworkDao.insert(oldCourseHomework);
 			List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
 					.constructInitialStudentHomeworkRecordsWithPayment(courseSchedule.getId(),
-							oldCourseHomework.getId());
+							oldCourseHomework.getId(),oldCourseHomework.getMusicScoreId());
 			if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 				throw new BizException("此课程没有学生");
 			}

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

@@ -242,7 +242,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 			//正常签退范围（结束后1小时内）
 			teacherAttendance.setSignOutTime(date);
-			teacherAttendance.setSignOutAttachments(teacherSignOutDto.getCourseHomeworkInfo().getAttachments());
+			CourseHomework courseHomeworkInfo = teacherSignOutDto.getCourseHomeworkInfo();
+			teacherAttendance.setSignOutAttachments(courseHomeworkInfo.getAttachments());
 			ClassGroup classGroup = classGroupDao.get(courseSchedule.getClassGroupId());
 			teacherAttendance.setCurrentClassTimes(classGroup.getCurrentClassTimes() + 1);
 			if(!isInScore){
@@ -269,11 +270,11 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				teacherAttendanceDao.insert(teacherAttendance);
 			}
 
-			if(StringUtils.isNotBlank(teacherSignOutDto.getCourseHomeworkInfo().getContent())){
+			if(StringUtils.isNotBlank(courseHomeworkInfo.getContent())){
 				CourseHomework courseHomework = courseHomeworkDao.findByCourseSchedule(teacherAttendance.getCourseScheduleId());
 				if(Objects.isNull(courseHomework)){
 					//新增课堂作业
-					courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
+					courseHomework = courseHomeworkInfo;
 					courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
 					courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 					courseHomework.setGroupType(teacherAttendance.getGroupType());
@@ -283,8 +284,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					courseHomeworkService.insert(courseHomework);
 
 					List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
-							.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
-									courseHomework.getId());
+							.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),courseHomework.getId(),courseHomework.getMusicScoreId());
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 						throw new BizException("此课程没有学生");
 					}

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

@@ -252,6 +252,7 @@
     <select id="constructInitialStudentHomeworkRecordsWithPayment" resultMap="StudentCourseHomework">
         SELECT #{courseHomeworkID} course_homework_id_,
                #{courseScheduleID} course_schedule_id_,
+               #{musicScoreId} music_score_id_,
                sa.user_id_,
                0                   status_,
                0                   is_replied_,