Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -147,6 +147,15 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	 */
 	int cleanCourseTeacherSignInfo(@Param("courseScheduleId") Long courseScheduleId);
 
+	/**
+	 * @describe 批量清空指定课程的教师签到信息
+	 * @author Joburgess
+	 * @date 2020/2/16
+	 * @param courseScheduleIds:
+	 * @return int
+	 */
+	int batchCleanCourseTeacherSignInfo(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
     TeacherAttendance getTeacherPersonalAttendance(Integer courseScheduleId);
 
 	/**

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

@@ -12,6 +12,16 @@ public class StudentNameAndPhoneDto {
 
     private String phone;
 
+    private String avatar;
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
     public Integer getUserId() {
         return userId;
     }

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

@@ -1343,6 +1343,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         checkNewCourseSchedules(courseSchedules, false);
         courseScheduleDao.batchUpdate(courseSchedules);
         classGroupService.updateClassGroupInfo(classGroup.getId());
+        if(vipGroupCourseAdjustInfo.getCourseCreateStartTime().after(now)){
+            teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleIds);
+        }
 //        vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 //        courseScheduleStudentPaymentService.updateVipGiveCourse(vipGroup.getId());
         if(scheduleModifyLogs.size() == courseSchedules.size()){
@@ -1695,6 +1698,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 courseTimeIsChange = true;
             }
 
+            if(newCourseSchedule.getStartClassTime().after(oldCourseSchedule.getStartClassTime())){
+                teacherAttendanceDao.cleanCourseTeacherSignInfo(newCourseSchedule.getId());
+            }
+
             oldCourseSchedule.setClassDate(newCourseSchedule.getClassDate());
             oldCourseSchedule.setStartClassTime(newCourseSchedule.getStartClassTime());
             oldCourseSchedule.setEndClassTime(newCourseSchedule.getEndClassTime());

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

@@ -116,7 +116,8 @@
         SELECT
             su.id_ userId,
             su.username_ userName,
-            su.phone_ phone
+            su.phone_ phone,
+            su.avatar_ avatar
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_

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

@@ -355,6 +355,14 @@
         SET sign_in_time_ = NULL,sign_in_status_=NULL,sign_out_status_ = NULL,sign_out_time_= NULL
     	WHERE course_schedule_id_=#{courseScheduleId}
     </update>
+    <update id="batchCleanCourseTeacherSignInfo">
+        UPDATE teacher_attendance
+        SET sign_in_time_ = NULL,sign_in_status_=NULL,sign_out_status_ = NULL,sign_out_time_= NULL
+    	WHERE course_schedule_id_ IN
+    	<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
+            #{courseScheduleId}
+        </foreach>
+    </update>
     <update id="cuntinueCourseSign">
         UPDATE teacher_attendance
         SET sign_in_time_ = #{startDateTime},sign_in_status_ = 1,sign_out_status_ = 1,sign_out_time_= #{endDateTime}