Joburgess 5 年之前
父節點
當前提交
a2e39fe210

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

@@ -173,6 +173,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 			courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
 			courseHomework.setExpectNum(studentAttendanceDao.countNormalAttendanceStudentNums(teacherAttendance.getCourseScheduleId()));
+			CourseSchedule nextCourseSchedule = courseScheduleDao.getNextCourseSchedule(classGroup.getId());
+			if(Objects.nonNull(nextCourseSchedule)){
+				courseHomework.setExpiryDate(nextCourseSchedule.getStartClassTime());
+			}
 			courseHomeworkService.insert(courseHomework);
 			List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
 					.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),

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

@@ -1381,13 +1381,31 @@
     </select>
     <select id="getNextCourseSchedule" resultMap="CourseSchedule">
         SELECT
-            *
+            cs.id_,
+            cs.class_group_id_,
+            cs.status_,
+            cs.subsidy_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.start_class_time_ start_class_time_str_,
+            cs.end_class_time_ end_class_time_str_,
+            cs.teacher_id_,
+            cs.actual_teacher_id_,
+            cs.create_time_,
+            cs.update_time_,
+            cs.teach_mode_,
+            cs.type_,
+            cs.name_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cs.schoole_id_
         FROM
-            course_schedule
+            course_schedule cs
         WHERE
-            class_group_id_=#{classGroupId}
-            AND CONCAT( class_date_, ' ', start_class_time_ ) &gt; NOW()
-        ORDER BY CONCAT( class_date_, ' ', start_class_time_ )
+            cs.class_group_id_=#{classGroupId}
+            AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &gt; NOW()
+        ORDER BY CONCAT( cs.class_date_, ' ', cs.start_class_time_ )
         LIMIT 1
     </select>
 </mapper>