fix:教学计划

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -539,7 +539,7 @@
         SELECT
         distinct
             cs.id_ AS courseId,
-            g.course_introduce_ AS courseIntroduce,
+        cp.plan_ AS courseIntroduce,
             cs.class_num_ AS classNum,
             cs.class_date_ AS classDate,
             cs.start_time_ AS startTime,
@@ -553,6 +553,7 @@
         LEFT JOIN course_group g ON cs.course_group_id_=g.id_
         LEFT JOIN course_schedule_teacher_salary ts ON cs.id_=ts.course_schedule_id_
         LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_
+        left join course_plan cp on cp.course_group_id_ = cs.course_group_id_ and cp.class_num_ = cs.class_num_
         WHERE cs.course_group_id_= #{param.groupId}
         <if test="param.salaryStatus != null and param.salaryStatus != ''">
             AND ts.status_ = #{param.salaryStatus}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -105,20 +105,20 @@
     </select>
 
     <select id="queryStudentInfoByGroupId" parameterType="map" resultType="com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo$CourseBuyStudentVo">
-        select distinct a.user_id_      as studentId,
+        select distinct o.user_id_      as studentId,
                b.real_name_    as studentName,
                b.username_    as userName,
                b.avatar_ as avatar,
-               a.created_time_ as createTime
-        from course_schedule_student_payment as a
-                 left join sys_user as b on a.user_id_ = b.id_
-                 left join user_order as o on a.order_no_ = o.order_no_
-        where a.course_group_id_ = #{param.groupId}
+               a.create_time_ as createTime
+        from user_order_detail as a
+        left join user_order as o on a.order_no_ = o.order_no_
+                 left join sys_user as b on o.user_id_ = b.id_
+        where a.biz_id_ = #{param.groupId} and a.good_type_ = 'LIVE'
         <if test="param.orderState != null and param.orderState != ''">
             AND o.status_ = #{param.orderState}
         </if>
         <if test="param.userId != null and param.userId != ''">
-            AND a.user_id_ = #{param.userId}
+            AND o.user_id_ = #{param.userId}
         </if>
     </select>
     <select id="selectAll" resultType="java.lang.Long">