Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -362,7 +362,8 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         timeList.forEach(o -> {
             boolean checkDataTime = courseScheduleService.checkStudentCourseTime(studentId, startTimeFun.apply(o), endTimeFun.apply(o));
             if (checkDataTime) {
-                throw new BizException("学生id:" + studentId + ",预计安排在" + DateUtil.dateToString(startTimeFun.apply(o), "yyyy年MM月dd号 HH点mm分") + "的课程时间存在冲突!");
+                SysUser sysUser = sysUserFeignService.queryUserById(studentId);
+                throw new BizException("学生:" + sysUser.getUsername() + ",预计安排在" + DateUtil.dateToString(startTimeFun.apply(o), "yyyy年MM月dd号 HH点mm分") + "的课程时间存在冲突!");
             }
         });
     }
@@ -976,6 +977,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
 
     @Override
     public IPage<CourseGroupVideoVo> selectVideoGroup(IPage<CourseGroupVideoVo> page, CourseGroupSearch search) {
+        search.setStatus(AuthStatusEnum.PASS.getCode());
         return baseMapper.selectVideoGroup(page, search);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseGroupVideoVo.java

@@ -32,6 +32,16 @@ public class CourseGroupVideoVo extends BaseEntity {
     private String teacherRealName;
     @ApiModelProperty("创建日期")
     private Date createTime;
+    @ApiModelProperty("审核通过日期")
+    private Date recordTime;
+
+    public Date getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
 
     public Long getGroupId() {
         return groupId;

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

@@ -570,13 +570,17 @@
             g.teacher_id_ AS teacherId,
             u.username_ AS teacherName,
             u.real_name_ AS teacherRealName,
-            g.create_time_ AS createTime
+            g.create_time_ AS createTime,
+            r.create_time_ AS recordTime
         FROM video_lesson_group g
         LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
         LEFT JOIN sys_user u ON g.teacher_id_=u.id_
         LEFT JOIN (
             SELECT video_lesson_group_id_,COUNT(1) AS count_ FROM video_lesson_purchase_record
             WHERE order_status_='PAID' GROUP BY video_lesson_group_id_) p ON g.id_=p.video_lesson_group_id_
+        LEFT JOIN (
+            SELECT video_group_id_,create_time_ FROM video_lesson_auth_record
+            WHERE audit_status_='PASS') r ON g.id_=r.video_group_id_
         <where>
             <if test="param.search != null and param.search != ''">
                 AND (
@@ -589,6 +593,9 @@
             <if test="param.subjectId != null and param.subjectId != ''">
                 AND g.lesson_subject_ = #{param.subjectId}
             </if>
+            <if test="param.status != null and param.status != ''">
+                AND g.audit_status_ = #{param.status}
+            </if>
         </where>
     </select>
     <select id="selectVideoGroupStudent" resultType="com.yonge.cooleshow.biz.dal.vo.CourseGroupStudentVo">