Merge branch 'dev_v1.3.7_20221020'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -211,7 +211,9 @@ public class VideoLessonController extends BaseController {
         }
 
         shelvesVo.setShelvesId(user.getId());
-        shelvesVo.setShelvesTime(new Date());
+        if (shelvesVo.getShelvesFlag() == 1) {
+            shelvesVo.setShelvesTime(new Date());
+        }
         shelvesVo.setClientType(ClientEnum.SYSTEM);
         lessonGroupService.updateShelves(shelvesVo);
         return succeed();

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

@@ -221,6 +221,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     	
     	if (examineVo.getAuditStatus().equals("PASS")) {
     		examineVo.setShelvesFlag(1);
+            examineVo.setShelvesTime(new Date());
     	}
         //改主表
         videoLessonGroupDao.updateExamine(examineVo);

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * @Author: cy
@@ -23,6 +24,17 @@ public class VideoLessonExamineVo extends BaseEntity {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty(value = "上下架时间", hidden = true)
+    private Date shelvesTime;
+
+    public Date getShelvesTime() {
+        return shelvesTime;
+    }
+
+    public void setShelvesTime(Date shelvesTime) {
+        this.shelvesTime = shelvesTime;
+    }
+
     public String getRemarks() {
         return remarks;
     }

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

@@ -582,7 +582,7 @@
             u.username_ AS teacherName,
             u.real_name_ AS teacherRealName,
             g.create_time_ AS createTime,
-            r.create_time_ AS recordTime,
+            g.shelves_time_ AS recordTime,
             g.shelves_flag_ as shelvesFlag,
             g.sort_number_ as sortNumber,
             g.top_flag_ as topFlag,
@@ -594,9 +594,6 @@
         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' order by version_ desc limit 1) r ON g.id_=r.video_group_id_
         <where>
             <if test="param.search != null and param.search != ''">
                 AND (