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

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

@@ -44,6 +44,17 @@ public class CourseScheduleStudentDto{
     @ApiModelProperty(value = "教学点")
     private String schoolName;
 
+    @ApiModelProperty(value = "是否达标")
+    private Integer qualifiedFlag;
+
+    public Integer getQualifiedFlag() {
+        return qualifiedFlag;
+    }
+
+    public void setQualifiedFlag(Integer qualifiedFlag) {
+        this.qualifiedFlag = qualifiedFlag;
+    }
+
     public Long getCourseId() {
         return courseId;
     }

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

@@ -5322,7 +5322,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				schoolTerm = schoolTerm1;
 			}
 			int courseNumNo = courseScheduleDao.getCourseNumNo(schoolTerm);
-			if(planList.size() >= courseNumNo){
+			if(planList.size() > courseNumNo){
 				scheduleRateDto.setCoursePlan(planList.get(courseNumNo - 1).getPlan());
 			}
 			//获取课程规划

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

@@ -4047,10 +4047,12 @@
         <result property="teacherAvatar" column="avatar_"/>
         <result property="teacherName" column="real_name_"/>
         <result property="schoolName" column="schoolName"/>
+        <result property="qualifiedFlag" column="qualified_flag_"/>
     </resultMap>
     <select id="queryDetailList" resultMap="CourseScheduleStudentDto">
-        select cssp.course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,CASE WHEN sa.status_ IS NULL OR sa.status_ = '' THEN 'TRUANT' ELSE sa.status_ END attendanceStatus,cs.status_ courseStatus,
-               cs.group_type_,cs.teach_mode_,cs.name_ courseName,su.avatar_,su.real_name_,co.name_ schoolName
+        select cssp.course_schedule_id_,cs.class_date_,CONCAT(cs.class_date_," ",cs.start_class_time_) start_class_time_,CONCAT(cs.class_date_," ",cs.end_class_time_) end_class_time_,
+               CASE WHEN sa.status_ IS NULL OR sa.status_ = '' THEN 'TRUANT' ELSE sa.status_ END attendanceStatus,cs.status_ courseStatus,
+               cs.group_type_,cs.teach_mode_,cs.name_ courseName,su.avatar_,su.real_name_,co.name_ schoolName,sa.qualified_flag_
         from course_schedule_student_payment cssp
         left join course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         left join sys_user su on cs.actual_teacher_id_ = su.id_