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

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

@@ -53,6 +53,17 @@ public class CourseScheduleStatistics {
 	@ApiModelProperty(value = "作业提交率")
 	private String homeworkCommitRate;
 
+	@ApiModelProperty(value = "课程时间")
+	private String classDate;
+
+	public String getClassDate() {
+		return classDate;
+	}
+
+	public void setClassDate(String classDate) {
+		this.classDate = classDate;
+	}
+
 	public String getAttendanceRate() {
 		return attendanceRate;
 	}

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

@@ -19,6 +19,7 @@
 		<result column="attendance_rate_" property="attendanceRate" />
 		<result column="standard_rate_" property="standardRate" />
 		<result column="homework_commit_rate_" property="homeworkCommitRate" />
+		<result column="class_date_" property="classDate" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -34,22 +35,25 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleStatistics" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO course_schedule_statistics (course_schedule_id_,music_group_id_,course_student_total_num_,
-		                                        attendance_num_,late_num_,standard_num_,homework_flag_,homework_commit_num_,service_flag_)
+		                                        attendance_num_,late_num_,standard_num_,homework_flag_,homework_commit_num_,service_flag_,class_date_)
 		                                        VALUES(#{courseScheduleId},#{musicGroupId},#{courseStudentTotalNum},#{attendanceNum},
-		                                               #{lateNum},#{standardNum},#{homeworkFlag},#{homeworkCommitNum},#{serviceFlag})
+		                                               #{lateNum},#{standardNum},#{homeworkFlag},#{homeworkCommitNum},#{serviceFlag},#{classDate})
 	</insert>
 	<insert id="batchInsert">
 		INSERT INTO course_schedule_statistics (course_schedule_id_,music_group_id_,course_student_total_num_,
-												attendance_num_,late_num_,standard_num_,homework_flag_,homework_commit_num_,service_flag_) VALUES
+												attendance_num_,late_num_,standard_num_,homework_flag_,homework_commit_num_,service_flag_,class_date_) VALUES
 		<foreach collection="scheduleStatisticsList" separator="," item="item">
 			(#{item.courseScheduleId},#{item.musicGroupId},#{item.courseStudentTotalNum},#{item.attendanceNum},
-			#{item.lateNum},#{item.standardNum},#{item.homeworkFlag},#{item.homeworkCommitNum},#{item.serviceFlag})
+			#{item.lateNum},#{item.standardNum},#{item.homeworkFlag},#{item.homeworkCommitNum},#{item.serviceFlag},#{classDate})
 		</foreach>
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleStatistics">
 		UPDATE course_schedule_statistics <set>
+		<if test="classDate != null and classDate != ''">
+			class_date_ = #{classDate},
+		</if>
 		<if test="homeworkFlag != null">
 		homework_flag_ = #{homeworkFlag},
 		</if>
@@ -80,6 +84,9 @@
 		<foreach collection="scheduleStatisticsList" item="item" index="index" open="" close="" separator=";">
 			UPDATE course_schedule_statistics
 			<set>
+			<if test="item.classDate != null and item.classDate != ''">
+				class_date_ = #{item.classDate},
+			</if>
 			<if test="item.homeworkFlag != null">
 				homework_flag_ = #{item.homeworkFlag},
 			</if>
@@ -130,7 +137,7 @@
 			   COUNT(CASE WHEN sa.status_ = 'NORMAL' THEN 1 ELSE NULL END) attendance_num_,
 			   COUNT(CASE WHEN sa.status_ = 'LATE' THEN 1 ELSE NULL END) late_num_,COUNT(CASE WHEN sa.qualified_flag_ = 1 THEN 1 ELSE NULL END) standard_num_,
 			   CASE WHEN sch.id_ IS NOT NULL THEN 1 ELSE 0 END homework_flag_,COUNT(CASE WHEN sch.status_ = 1 THEN 1 ELSE NULL END) homework_commit_num_,
-			   CASE WHEN sees.course_ids_ IS NOT NULL THEN 1 ELSE 0 END service_flag_
+			   CASE WHEN sees.course_ids_ IS NOT NULL THEN 1 ELSE 0 END service_flag_,cs.class_date_
 		FROM course_schedule_statistics_wait cssw
 				 LEFT JOIN course_schedule_statistics css ON css.course_schedule_id_ = cssw.course_schedule_id_
 				 LEFT JOIN course_schedule cs ON cs.id_ = cssw.course_schedule_id_