学习计划

zhongzheng-api/src/main/java/com/zhongzheng/controller/activity/ActivityConfigurationController.java

@@ -56,9 +56,9 @@ public class ActivityConfigurationController extends BaseController {
      */
     @ApiOperation("查询活动配置列表")
     @GetMapping("/list")
-    public TableDataInfo<CourseConfigurationVo> list(ActivityConfigurationQueryBo bo) {
+    public TableDataInfo<ActivityConfigurationVo> list(ActivityConfigurationQueryBo bo) {
         startPage();
-        List<CourseConfigurationVo> list = iActivityConfigurationService.queryIssueList(bo);
+        List<ActivityConfigurationVo> list = iActivityConfigurationService.queryIssueList(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -42,7 +42,7 @@ public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfigur
      * @param bo 详细配置信息
      * @return Collection<CourseConfigurationVo> 详细配置
      */
-    Collection<CourseConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
+    Collection<ActivityConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
 
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationService.java

@@ -59,7 +59,7 @@ public interface IActivityConfigurationService extends IService<ActivityConfigur
 	 * @param bo
 	 * @return List<CourseConfigurationVo>
 	 */
-    List<CourseConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo);
+    List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo);
 
 	/**
 	 * 查询活动课程

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -132,9 +132,9 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     }
 
     @Override
-    public List<CourseConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
+    public List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
         bo.setStartTime(DateUtils.getNowTime());
-        List<CourseConfigurationVo> courseConfigurationVos = entityCourseVo(baseMapper.selectConfiguraIssueList(bo));
+        List<ActivityConfigurationVo> courseConfigurationVos = entityCourseVo(baseMapper.selectConfiguraIssueList(bo));
         return courseConfigurationVos;
     }
 
@@ -156,13 +156,13 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
      * @param collection 实体类集合
      * @return
      */
-    private List<CourseConfigurationVo> entityCourseVo(Collection<CourseConfigurationVo> collection) {
-        List<CourseConfigurationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, CourseConfigurationVo.class))
+    private List<ActivityConfigurationVo> entityCourseVo(Collection<ActivityConfigurationVo> collection) {
+        List<ActivityConfigurationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityConfigurationVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<CourseConfigurationVo> page = (Page<CourseConfigurationVo>)collection;
-            Page<CourseConfigurationVo> pageVo = new Page<>();
+            Page<ActivityConfigurationVo> page = (Page<ActivityConfigurationVo>)collection;
+            Page<ActivityConfigurationVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -85,6 +85,7 @@ public class ActivityConfigurationVo {
 	@ApiModelProperty("有效期几个月")
 	private Integer couponEnd;
 
+
 	/** 绑定课程 */
 	@Excel(name = "绑定课程")
 	@ApiModelProperty("绑定课程")

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseVo.java

@@ -72,5 +72,9 @@ public class CourseVo {
 	@ApiModelProperty("分类名")
 	private String categoryName;
 
+	@Excel(name = "是否已经领取  yes领取 no 未领取")
+	@ApiModelProperty("是否已经领取  yes领取 no 未领取")
+	private String useStatus;
+
 
 }

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -53,7 +53,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseName" column="course_name"/>
     </resultMap>
 
-    <resultMap type="com.zhongzheng.modules.course.vo.CourseConfigurationVo" id="CourseResultConfiguration">
+    <resultMap type="com.zhongzheng.modules.activity.vo.ActivityConfigurationVo" id="CourseResultConfiguration">
+        <result property="id" column="sid"/>
+        <result property="activityName" column="sactivity_name"/>
+        <result property="activityType" column="sactivity_type"/>
+        <result property="description" column="sdescription"/>
+        <result property="startTime" column="sstart_time"/>
+        <result property="endTime" column="send_time"/>
+        <result property="price" column="sprice"/>
+        <result property="quantity" column="squantity"/>
+        <result property="liveContent" column="slive_content"/>
+        <result property="liveAdress" column="slive_adress"/>
+        <result property="createTime" column="screate_time"/>
+        <result property="updateTime" column="supdate_time"/>
+        <result property="status" column="sstatus"/>
+        <result property="couponEnd" column="scoupon_end"/>
+        <association property="courses" javaType="java.util.List" resultMap="courses" />
+
+
+    </resultMap>
+
+    <resultMap id="courses" type="com.zhongzheng.modules.course.vo.CourseVo">
         <result property="courseId" column="course_id"/>
         <result property="categoryId" column="category_id"/>
         <result property="price" column="price"/>
@@ -66,22 +86,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="teacherIds" column="teacher_ids"/>
         <result property="courseName" column="course_name"/>
         <result property="useStatus" column="useStatus"/>
-        <association property="activityConfigurationVo" javaType="com.zhongzheng.modules.activity.vo.ActivityConfigurationVo" >
-            <result property="id" column="sid"/>
-            <result property="activityName" column="sactivity_name"/>
-            <result property="activityType" column="sactivity_type"/>
-            <result property="description" column="sdescription"/>
-            <result property="startTime" column="sstart_time"/>
-            <result property="endTime" column="send_time"/>
-            <result property="price" column="sprice"/>
-            <result property="quantity" column="squantity"/>
-            <result property="liveContent" column="slive_content"/>
-            <result property="liveAdress" column="slive_adress"/>
-            <result property="createTime" column="screate_time"/>
-            <result property="updateTime" column="supdate_time"/>
-            <result property="status" column="sstatus"/>
-            <result property="couponEnd" column="scoupon_end"/>
-        </association>
     </resultMap>
 
     <select id="selectConfiguraList" parameterType="com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo" resultMap="ActivityConfigurationResultVO">