Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherFreeTime.java

@@ -87,6 +87,18 @@ public class TeacherFreeTime implements Serializable {
     @ApiModelProperty(value = "修改时间;")
     private Date updateTime;
 
+    @TableField("enable_flag_")
+    @ApiModelProperty(value = "是否开启陪练课(1是 0否)")
+    private Boolean enableFlag = true;
+
+    public Boolean getEnableFlag() {
+        return enableFlag;
+    }
+
+    public void setEnableFlag(Boolean enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+
     public Boolean getDefaultFlag() {
         return defaultFlag;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherFreeTimeVo.java

@@ -62,6 +62,17 @@ public class TeacherFreeTimeVo implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "是否开启陪练课(1是 0否)")
+    private Boolean enableFlag = true;
+
+    public Boolean getEnableFlag() {
+        return enableFlag;
+    }
+
+    public void setEnableFlag(Boolean enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+
     public Long getId() {
         return id;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -417,7 +417,7 @@
         p.course_minutes_ AS courseMinutes
         FROM teacher_free_time f
         LEFT JOIN teacher_subject_price p ON f.id_=p.teacher_free_time_id
-        WHERE f.default_flag_=1
+        WHERE f.default_flag_=1 AND f.enable_flag_=1
         AND p.subject_id_=#{param.subjectId}) sp ON t.user_id_=sp.teacherId
 
         <where>
@@ -800,7 +800,7 @@
         )
     </select>
     <select id="teacherIdList" resultType="java.lang.Long">
-        SELECT teacher_id_ FROM teacher_free_time GROUP BY teacher_id_
+        SELECT teacher_id_ FROM teacher_free_time WHERE enable_flag_=1 GROUP BY teacher_id_
     </select>
     <select id="selectIdList" resultType="java.lang.Long">
         SELECT id_ FROM course_schedule WHERE lock_=0 AND class_date_ &lt;= #{day}