1、教务端课程交换

2、vip课退课费用及相关逻辑调整
3、补签到、签退

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

@@ -1132,7 +1132,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         }
                         courseSchedules.get(courseStartDates.size() - 1).setTeachMode(vipGroupCourseAdjustInfo.getTeachMode());
                         if (vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)) {
-                            courseSchedules.get(courseStartDates.size() - 1).setSchoolId(vipGroupCourseAdjustInfo.getSchoolId());
+                            if(Objects.nonNull(vipGroupCourseAdjustInfo.getSchoolId())){
+                                courseSchedules.get(courseStartDates.size() - 1).setSchoolId(vipGroupCourseAdjustInfo.getSchoolId());
+                            }
                         } else {
                             courseSchedules.get(courseStartDates.size() - 1).setSchoolId(null);
                         }

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

@@ -441,7 +441,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			teacherAttendance.setTeacherId(teacherAttendanceInfo.getTeacherId());
 			teacherAttendance.setCreateTime(date);
 		}
-		teacherAttendance.setSignOutTime(date);
+		teacherAttendance.setSignInTime(date);
 		teacherAttendance.setSignInStatus(teacherAttendanceInfo.getSignInStatus());
 		teacherAttendance.setSignOutTime(date);
 		teacherAttendance.setSignOutStatus(teacherAttendanceInfo.getSignOutStatus());

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

@@ -1264,7 +1264,11 @@
             cs.schoole_id_
         FROM course_schedule cs
           LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-        WHERE cs.teacher_id_=#{teacherId} and CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) between #{startTime} and #{endTime}
+          LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cs.teacher_id_=#{teacherId}
+        and CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) between #{startTime} and #{endTime}
         <if test="type != null">
           and cs.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>

mec-web/src/main/resources/application.yml

@@ -33,7 +33,7 @@ spring:
 #    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
 #    username: dayaData
 #    password: dayaDataOnline2019
-    url: jdbc:mysql://120.26.238.168:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: mec_dev
     password: mec_dev
     # 使用druid数据源