Merge branch 'dev_1_2_20220802' of http://git.dayaedu.com/yonge/cooleshow into dev_1_2_20220802

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoLessonGroupSearch.java

@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "VideoLessonGroupSearch", description = "视频课组列表查询")
 public class VideoLessonGroupSearch extends QueryInfo {
-    @ApiModelProperty(value = "是否上架 （0:否  1：是）",hidden = true)
+    @ApiModelProperty(value = "是否上架 （0:否  1：是）")
     private Integer shelvesFlag;
 
     @ApiModelProperty(value = "审核状态(DOING:审核中 PASS:已上架 UNPASS:审核失败 UNSHELVES: 下架)")

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

@@ -47,7 +47,10 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
         List<Long> musicSheetIds = WrapperUtil.toLongList(param.getMusicSheetIds());
         //过滤出未添加的曲子
         musicSheetIds = baseMapper.selectUnjoinMusicIds(param.getActivityId(), musicSheetIds);
-        return baseMapper.addBatch(param.getActivityId(), musicSheetIds) > 0;
+        if (CollectionUtils.isNotEmpty(musicSheetIds)) {
+            baseMapper.addBatch(param.getActivityId(), musicSheetIds);
+        }
+        return true;
     }
 
 

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.Date;
 
 /**
  * @author: cy
@@ -48,10 +49,6 @@ public class VideoLessonGroupUpVo extends BaseEntity {
     @ApiModelProperty(value = "是否热门课程")
     private Integer hotFlag;
 
-    @ApiModelProperty(value = "是否上架 （0:否  1：是）")
-    @ListValue(vals = {0, 1}, message = "是否上架必须提交指定值")
-    private Integer shelvesFlag;
-
     @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
     @ListValue(vals = {0, 1, 2}, message = "审核状态必须提交指定值")
     private Integer auditStatus;
@@ -144,11 +141,4 @@ public class VideoLessonGroupUpVo extends BaseEntity {
         this.auditStatus = auditStatus;
     }
 
-    public Integer getShelvesFlag() {
-        return shelvesFlag;
-    }
-
-    public void setShelvesFlag(Integer shelvesFlag) {
-        this.shelvesFlag = shelvesFlag;
-    }
 }

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

@@ -83,10 +83,6 @@
 			<if test="lessonTag !=null and lessonTag !=''">lesson_tag_ = #{lessonTag},</if>
 			<if test="topFlag !=null">top_flag_ = #{topFlag},</if>
 			<if test="hotFlag !=null">hot_flag_ = #{hotFlag},</if>
-			<if test="shelvesFlag !=null">shelves_flag_ = #{shelvesFlag},</if>
-			<if test="shelvesTime !=null">shelves_time_ = #{shelvesTime},</if>
-			<if test="shelvesReason !=null and shelvesReason !=''">shelves_reason_ = #{shelvesReason},</if>
-			<if test="shelvesId !=null">shelves_id_ = #{shelvesId},</if>
 			<if test="auditStatus !=null">audit_status_ = #{auditStatus},</if>
 			update_time_ = SYSDATE(),
 			lesson_count_ = (SELECT COUNT(1) FROM video_lesson_group_detail WHERE video_lesson_group_id_ = #{id})

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupController.java

@@ -66,6 +66,7 @@ public class VideoLessonGroupController extends BaseController {
         }
         if(!StringUtil.isNullOrEmpty(query.getAuditStatus())){
             if(query.getAuditStatus().equals("UNSHELVES")){
+                query.setAuditStatus(null);
                 query.setShelvesFlag(0);
             }else{
                 query.setShelvesFlag(1);