1、教务端课程交换

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

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

@@ -43,6 +43,26 @@ public class VipGroupCourseSchduleRecordDto {
 
     private Integer schooleId;
 
+    private Integer signInStatus;
+
+    private Integer signOutStatus;
+
+    public Integer getSignInStatus() {
+        return signInStatus;
+    }
+
+    public void setSignInStatus(Integer signInStatus) {
+        this.signInStatus = signInStatus;
+    }
+
+    public Integer getSignOutStatus() {
+        return signOutStatus;
+    }
+
+    public void setSignOutStatus(Integer signOutStatus) {
+        this.signOutStatus = signOutStatus;
+    }
+
     public String getStartClassTimeStr() {
         return startClassTimeStr;
     }

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

@@ -558,6 +558,8 @@
         <result column="student_num_" property="attendanceNum"/>
         <result column="school_name_" property="schoolName"/>
         <result column="schoole_id_" property="schooleId"/>
+        <result column="sign_in_status_" property="signInStatus"/>
+        <result column="sign_out_status_" property="signOutStatus"/>
     </resultMap>
 
     <sql id="teachingRecordQueryCondition">
@@ -584,11 +586,14 @@
             cs.teach_mode_,
             cs.student_num_,s.name_ school_name_,
             csts.actual_salary_ IS NOT NULL is_salary_,
-            cs.schoole_id_
+            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_
         FROM
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
             left join school s on cs.schoole_id_ = s.id_
+            LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_ AND ta.teacher_id_ = cs.actual_teacher_id_
         <include refid="teachingRecordQueryCondition"/>
         ORDER BY start_class_time_
         <include refid="global.limit"/>