Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,8 @@ public class CourseScheduleComplaintsDto{
     private Integer score;
 
     private String avatar;
+    
+    private Integer userId;
 
     public String getUsername() {
         return username;
@@ -41,4 +43,12 @@ public class CourseScheduleComplaintsDto{
     public void setAvatar(String avatar) {
         this.avatar = avatar;
     }
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
 }

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

@@ -120,9 +120,10 @@
 		<result property="reason" column="reason_"/>
 		<result property="score" column="score_"/>
 		<result property="avatar" column="avatar_"/>
+		<result property="userId" column="user_id_"/>
 	</resultMap>
 	<select id="findByCourseScheduleId" resultMap="CourseScheduleComplaintsDtoMap">
-		SELECT su.username_,csc.reason_,csc.score_,su.avatar_
+		SELECT su.username_,csc.reason_,csc.score_,su.avatar_,su.id_ user_id_
 		FROM course_schedule_complaints csc
 		LEFT JOIN sys_user su ON su.id_ = csc.user_id_
 		WHERE csc.course_schedule_id_ = #{courseScheduleId}

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

@@ -1560,7 +1560,7 @@
     <!-- 查找班级未开始的课程 -->
     <select id="findCoursesByClassGroupId" resultMap="CourseSchedule">
         SELECT * FROM course_schedule
-        WHERE class_group_id_ = #{classGroupId}
+        WHERE class_group_id_ = #{classGroupId} and (new_course_id_ is null or new_course_id_ = 0)
         <if test="status != null">
             and status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
@@ -3338,7 +3338,7 @@
 		SELECT a.course_type_,SUM(remain_minutes_) remain_minutes_ FROM 
 		(SELECT cs.type_ course_type_,SUM(TIMESTAMPDIFF(MINUTE,STR_TO_DATE(concat(cs.class_date_,' ',cs.start_class_time_),'%Y-%m-%d %H:%i:%s'),
         STR_TO_DATE(concat(cs.class_date_,' ',cs.end_class_time_),'%Y-%m-%d %H:%i:%s'))) remain_minutes_
-		from course_schedule cs where FIND_IN_SET(cs.class_group_id_,#{classgroupId}) and cs.status_ = 'NOT_START' group by cs.type_
+		from course_schedule cs where FIND_IN_SET(cs.class_group_id_,#{classgroupId}) and cs.status_ = 'NOT_START' and (cs.new_course_id_ is null or cs.new_course_id_ = 0) group by cs.type_
 		UNION  
 		SELECT ncs.type_ course_type_,SUM(TIMESTAMPDIFF(MINUTE,STR_TO_DATE(concat(ncs.class_date_,' ',ncs.start_class_time_),'%Y-%m-%d %H:%i:%s'),
         STR_TO_DATE(concat(ncs.class_date_,' ',ncs.end_class_time_),'%Y-%m-%d %H:%i:%s'))) remain_minutes_ FROM course_schedule cs LEFT JOIN course_schedule ncs ON ncs.id_ = cs.new_course_id_