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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseScheduleRecordDto.java

@@ -61,6 +61,17 @@ public class StudentCourseScheduleRecordDto {
     @ApiModelProperty(value = "教学点")
     private String teachingAddress;
 
+    @ApiModelProperty(value = "是否达标1是0否")
+    private Integer qualifiedFlag = 0;
+
+    public Integer getQualifiedFlag() {
+        return qualifiedFlag;
+    }
+
+    public void setQualifiedFlag(Integer qualifiedFlag) {
+        this.qualifiedFlag = qualifiedFlag;
+    }
+
     public String getHeadUrl() {
         return headUrl;
     }

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

@@ -109,6 +109,7 @@
         <result column="rest_of_class_" property="restOfClass"/>
         <result column="class_group_id_" property="classGroupId"/>
         <result column="school_name_" property="teachingAddress" />
+        <result column="qualified_flag_" property="qualifiedFlag" />
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentCourseInfoDto" id="StudentCourseInfoDto">
@@ -1113,7 +1114,8 @@
         CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
         cs.actual_teacher_id_ teacher_id_,
         cs.teach_mode_,
-        s.name_ school_name_
+        s.name_ school_name_,
+        sa.qualified_flag_
         FROM course_schedule_student_payment cssp
         LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ =
         sa.user_id_