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

@@ -56,6 +56,17 @@ public class CourseScheduleStatistics {
 	@ApiModelProperty(value = "课程时间")
 	private String classDate;
 
+	@ApiModelProperty(value = "课程状态")
+	private String courseStatus;
+
+	public String getCourseStatus() {
+		return courseStatus;
+	}
+
+	public void setCourseStatus(String courseStatus) {
+		this.courseStatus = courseStatus;
+	}
+
 	public String getClassDate() {
 		return classDate;
 	}

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

@@ -1006,6 +1006,7 @@
         LEFT JOIN course_schedule_statistics css ON css.course_schedule_id_ = cs.id_
         LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_ AND csts.teacher_role_ = 'BISHOP'
         <include refid="queryMusicGroupCourseScheduleDetailSql"/>
+        AND css.course_status_ = 'OVER'
         GROUP BY cs.music_group_id_
     </select>
 

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

@@ -20,6 +20,7 @@
 		<result column="standard_rate_" property="standardRate" />
 		<result column="homework_commit_rate_" property="homeworkCommitRate" />
 		<result column="class_date_" property="classDate" />
+		<result column="course_status_" property="courseStatus" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -35,16 +36,16 @@
 	<!-- 向数据库增加一条记录 -->
 	<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_,class_date_)
+		                                        attendance_num_,late_num_,standard_num_,homework_flag_,homework_commit_num_,service_flag_,class_date_,course_status_)
 		                                        VALUES(#{courseScheduleId},#{musicGroupId},#{courseStudentTotalNum},#{attendanceNum},
-		                                               #{lateNum},#{standardNum},#{homeworkFlag},#{homeworkCommitNum},#{serviceFlag},#{classDate})
+		                                               #{lateNum},#{standardNum},#{homeworkFlag},#{homeworkCommitNum},#{serviceFlag},#{classDate},#{courseStatus})
 	</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_,class_date_) VALUES
+												attendance_num_,late_num_,standard_num_,homework_flag_,homework_commit_num_,service_flag_,class_date_,course_status_) 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},#{classDate})
+			#{item.lateNum},#{item.standardNum},#{item.homeworkFlag},#{item.homeworkCommitNum},#{item.serviceFlag},#{classDate},#{courseStatus})
 		</foreach>
 	</insert>
 
@@ -54,6 +55,9 @@
 		<if test="classDate != null and classDate != ''">
 			class_date_ = #{classDate},
 		</if>
+		<if test="courseStatus != null and courseStatus != ''">
+			course_status_ = #{courseStatus},
+		</if>
 		<if test="homeworkFlag != null">
 		homework_flag_ = #{homeworkFlag},
 		</if>
@@ -84,6 +88,9 @@
 		<foreach collection="scheduleStatisticsList" item="item" index="index" open="" close="" separator=";">
 			UPDATE course_schedule_statistics
 			<set>
+			<if test="item.courseStatus != null and item.courseStatus != ''">
+				course_status_ = #{item.courseStatus},
+			</if>
 			<if test="item.classDate != null and item.classDate != ''">
 				class_date_ = #{item.classDate},
 			</if>