运营活动修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanEvaluationDao.java

@@ -1,30 +1,8 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
-import com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanEvaluationSearch;
 
 
 public interface ActivityPlanEvaluationDao extends BaseMapper<ActivityPlanEvaluation>{
-	/**
-	 * 查询详情
-     * @author liweifan
-     * @date 2022-08-04 10:19:49
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo
-	 */
-	ActivityPlanEvaluationVo detail(@Param("id") Long id);
-
-	/**
-	 * 分页查询
-     * @author liweifan
-     * @date 2022-08-04 10:19:49
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo
-	 */
-	List<ActivityPlanEvaluationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanEvaluationSearch activityPlanEvaluation);
-	
 }

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

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dto;
-
-import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
-import io.swagger.annotations.ApiModel;
-
-/**
- * @Author: liweifan
- * @Data: 2022-08-04 10:19:49
- */
-@ApiModel(value = "ActivityPlanEvaluationDto对象", description = "活动计划表数据传输对象")
-public class ActivityPlanEvaluationDto extends ActivityPlanEvaluation{
-	private static final long serialVersionUID = 1L;
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlanEvaluation.java

@@ -13,10 +13,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 活动计划表
+ * 活动计划-评测活动拓展字段表
  */
 @TableName("activity_plan_evaluation")
-@ApiModel(value = "ActivityPlanEvaluation对象", description = "活动计划表")
+@ApiModel(value = "ActivityPlanEvaluation对象", description = "活动计划-评测活动拓展字段表")
 public class ActivityPlanEvaluation implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键(活动id) ")

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

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author: liweifan
@@ -10,4 +12,15 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "ActivityPlanVo对象", description = "活动计划表查询视图对象")
 public class ActivityPlanVo extends ActivityPlan{
 	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "活动计划-评测活动拓展")
+	private ActivityPlanEvaluationVo planEvaluationVo;
+
+	public ActivityPlanEvaluationVo getPlanEvaluationVo() {
+		return planEvaluationVo;
+	}
+
+	public void setPlanEvaluationVo(ActivityPlanEvaluationVo planEvaluationVo) {
+		this.planEvaluationVo = planEvaluationVo;
+	}
 }

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

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityPlanEvaluationDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation">
-            <result column="id_" property="id" />
-	        <result column="evaluation_difficulty_" property="evaluationDifficulty" />
-	        <result column="create_time_" property="createTime" />
-	        <result column="create_by_" property="createBy" />
-	        <result column="update_time_" property="updateTime" />
-	        <result column="update_by_" property="updateBy" />
-		</resultMap>  
-    
-    <!-- 表字段 -->
-    <sql id="baseColumns">
-         t.id_ as id
-        , t.evaluation_difficulty_ as evaluationDifficulty
-        , t.create_time_ as createTime
-        , t.create_by_ as createBy
-        , t.update_time_ as updateTime
-        , t.update_by_ as updateBy
-        </sql> 
-    
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo">
-        SELECT
-            <include refid="baseColumns"/>
-        FROM activity_plan_evaluation t
-        where t.id_ = #{id}
-    </select>
-    
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo">
-		SELECT         
-        	<include refid="baseColumns" />
-		FROM activity_plan_evaluation t
-	</select>
-</mapper>

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenVideoGroupController.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.website.controller.open;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo;
@@ -43,6 +44,7 @@ public class OpenVideoGroupController extends BaseController {
     @ApiOperation(value = "查询视频课组")
     @PostMapping(value = "/page")
     public HttpResponseResult<PageInfo<VideoLessonGroupVo>> page(@RequestBody VideoLessonGroupSearch query) {
+        query.setAuditStatus(AuthStatusEnum.PASS.getCode());
         IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }