1、教务端课程交换

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

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

@@ -45,9 +45,15 @@ public class MusicGroupCourseScheduleDto {
     @ApiModelProperty(value = "课程状态",required = false)
     private String courseScheduleStatus;
 
+    @ApiModelProperty(value = "签到时间")
+    private Date signInTime;
+
     @ApiModelProperty(value = "签到状态",required = false)
     private String signInStatus;
 
+    @ApiModelProperty(value = "签退时间")
+    private Date signOutTime;
+
     @ApiModelProperty(value = "签退状态",required = false)
     private String signOutStatus;
 
@@ -69,6 +75,22 @@ public class MusicGroupCourseScheduleDto {
     @ApiModelProperty(value = "签到备注")
     private String remark;
 
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public Date getSignOutTime() {
+        return signOutTime;
+    }
+
+    public void setSignOutTime(Date signOutTime) {
+        this.signOutTime = signOutTime;
+    }
+
     public String getRemark() {
         return remark;
     }

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

@@ -43,10 +43,32 @@ public class VipGroupCourseSchduleRecordDto {
 
     private Integer schooleId;
 
+    @ApiModelProperty(value = "签到时间")
+    private Date signInTime;
+
     private Integer signInStatus;
 
+    @ApiModelProperty(value = "签退时间")
+    private Date signOutTime;
+
     private Integer signOutStatus;
 
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public Date getSignOutTime() {
+        return signOutTime;
+    }
+
+    public void setSignOutTime(Date signOutTime) {
+        this.signOutTime = signOutTime;
+    }
+
     public Integer getSignInStatus() {
         return signInStatus;
     }

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

@@ -438,6 +438,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		Date date = new Date();
 		if(Objects.isNull(teacherAttendance)){
 			teacherAttendance=new TeacherAttendance();
+			teacherAttendance.setGroupType(courseSchedule.getGroupType());
+			teacherAttendance.setMusicGroupId(courseSchedule.getMusicGroupId());
+			teacherAttendance.setClassGroupId(courseSchedule.getClassGroupId());
+			teacherAttendance.setCourseScheduleId(courseSchedule.getId());
 			teacherAttendance.setTeacherId(teacherAttendanceInfo.getTeacherId());
 			teacherAttendance.setCreateTime(date);
 		}

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

@@ -602,7 +602,9 @@
         <result property="mixClassGroupId" column="mix_class_group_id_"/>
         <result property="courseScheduleType" column="course_schedule_type_"/>
         <result property="courseScheduleStatus" column="course_schedule_status_"/>
+        <result property="signInTime" column="sign_in_time_"/>
         <result property="signInStatus" column="sign_in_status_"/>
+        <result property="signOutTime" column="sign_out_time_"/>
         <result property="signOutStatus" column="sign_out_status_"/>
         <result property="settlementTime" column="settlement_time_"/>
         <result property="remark" column="remark_"/>
@@ -630,6 +632,8 @@
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
         csts.settlement_time_,
+        ta.sign_in_time_,
+        ta.sign_out_time_,
         ta.remark_
         FROM course_schedule cs
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_

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

@@ -560,6 +560,8 @@
         <result column="schoole_id_" property="schooleId"/>
         <result column="sign_in_status_" property="signInStatus"/>
         <result column="sign_out_status_" property="signOutStatus"/>
+        <result column="sign_in_time_" property="signInTime"/>
+        <result column="sign_out_time_" property="signOutTime"/>
     </resultMap>
 
     <sql id="teachingRecordQueryCondition">
@@ -588,7 +590,9 @@
             csts.actual_salary_ IS NOT NULL is_salary_,
             cs.schoole_id_,
             IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
-            IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_
+            IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
+            ta.sign_in_time_,
+            ta.sign_out_time_
         FROM
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_