Merge remote-tracking branch 'origin/master'

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

@@ -40,7 +40,9 @@
         where id_ = #{id,jdbcType=INTEGER}
     </delete>
     <delete id="delByCourseScheduleId">
-        DELETE FROM course_schedule_review WHERE course_schedule_id_ = #{courseScheduleId}
+        DELETE
+        FROM course_schedule_review
+        WHERE course_schedule_id_ = #{courseScheduleId}
     </delete>
     <delete id="delByCourseScheduleIds">
         DELETE FROM course_schedule_review WHERE course_schedule_id_ IN
@@ -333,7 +335,7 @@
         FROM course_schedule_review
         WHERE course_schedule_id_ = #{courseScheduleId}
         <if test="studentId != null">
-          AND student_id_ = #{studentId}
+            AND student_id_ = #{studentId}
         </if>
     </select>
 
@@ -388,17 +390,16 @@
     </select>
 
     <select id="getOnlineCourseReviewList" resultMap="CourseReviewDto">
-        SELECT cs.id_,cs.class_date_,cs.name_ course_name_,csr.id_ review_id_, csc.score_ student_review_,
+        SELECT cs.id_,cs.class_date_,cs.name_ course_name_,csr.id_ review_id_,
         csr.hand_homework_,csr.course_review_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
-        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,sa.id_
-        attendance_id_,sch.is_replied_ home_work_replied_,
-        CASE WHEN sch.id_ IS NULL THEN 0 ELSE 1 END assign_homework_
+        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,
+        sa.id_ attendance_id_
         FROM course_schedule cs
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
-        LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
-        LEFT JOIN student_attendance sa on sa.course_schedule_id_ = cs.id_
-        LEFT JOIN student_course_homework sch on cs.id_ = sch.course_schedule_id_
+        LEFT JOIN (
+        SELECT course_schedule_id_,id_ FROM student_attendance LIMIT 1
+        ) sa ON sa.course_schedule_id_ = cs.id_
         <include refid="courseReviewsQueryCondition"/>
         ORDER BY cs.class_date_ DESC
         <include refid="global.limit"/>
@@ -407,15 +408,16 @@
     <select id="countOnlineCourseReviews" resultType="java.lang.Integer">
         SELECT count(*) FROM course_schedule cs
         LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
-        LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
-        LEFT JOIN student_attendance sa on sa.course_schedule_id_ = cs.id_
-        LEFT JOIN student_course_homework sch on cs.id_ = sch.course_schedule_id_
+        LEFT JOIN(
+        SELECT course_schedule_id_,id_ FROM student_attendance LIMIT 1
+        ) sa ON sa.course_schedule_id_ = cs.id_
         <include refid="courseReviewsQueryCondition"/>
     </select>
 
     <sql id="courseReviewsQueryCondition">
         <where>
-            AND cs.type_ IN ('PRACTICE','VIP') AND cs.teach_mode_='ONLINE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS NULL)
+            AND cs.type_ IN ('PRACTICE','VIP') AND cs.teach_mode_='ONLINE' AND cs.status_='OVER' AND (cs.del_flag_ = 0
+            OR cs.del_flag_ IS NULL)
             <if test="search!=null and search!=''">
                 AND (cs.name_ LIKE CONCAT('%',#{search},'%') OR cs.id_= #{search})
             </if>
@@ -467,20 +469,16 @@
             <if test='hasArrived !=null and hasArrived=="0"'>
                 AND sa.id_ IS NULL
             </if>
-            <if test='homeWorkReplied !=null and homeWorkReplied =="1"'>
-                AND sch.is_replied_ > 0
-            </if>
-            <if test='homeWorkReplied !=null and homeWorkReplied =="0"'>
-                AND (sch.is_replied_ = 0 OR sch.is_replied_ IS NULL)
-            </if>
         </where>
     </sql>
 
     <select id="getVipCourseReviewList" resultMap="CourseReviewDto">
-        SELECT cs.id_,cs.actual_teacher_id_ teacher_id ,cs.class_date_, (SELECT group_concat(name_) FROM subject sb WHERE FIND_IN_SET(id_,cg.subject_id_list_)) AS
+        SELECT cs.id_,cs.actual_teacher_id_ teacher_id ,cs.class_date_, (SELECT group_concat(name_) FROM subject sb
+        WHERE FIND_IN_SET(id_,cg.subject_id_list_)) AS
         subject_name_ ,vg.organ_id_,cs.name_
         course_name_,su.real_name_ teacher_name_,edsu.real_name_
-        edu_teacher_name_,csr.id_ review_id_,csr.hand_homework_,csr.course_review_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
+        edu_teacher_name_,csr.id_
+        review_id_,csr.hand_homework_,csr.course_review_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
         csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,
         CASE WHEN ch.id_ IS NULL THEN 0 ELSE 1 END assign_homework_
         FROM course_schedule cs