计划修改

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

@@ -3,6 +3,8 @@ package com.zhongzheng.modules.activity.mapper;
 import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 活动配置关联课程包含范围Mapper接口
  *
@@ -18,4 +20,6 @@ public interface ActivityConfigurationCourseMapper extends BaseMapper<ActivityCo
      *
      */
     void insertCourse(ActivityConfigurationCourse activityConfigurationCourse);
+
+    List<Long> selectConfiguraList(Long id);
 }

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

@@ -49,4 +49,6 @@ public interface IActivityConfigurationCourseService extends IService<ActivityCo
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<Long> selectConfiguraList(Long id);
 }

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

@@ -91,4 +91,9 @@ public class ActivityConfigurationCourseServiceImpl extends ServiceImpl<Activity
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<Long> selectConfiguraList(Long id) {
+        return baseMapper.selectConfiguraList(id);
+    }
 }

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

@@ -13,6 +13,7 @@ import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
 import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
 import com.zhongzheng.modules.activity.mapper.ActivityConfigurationCourseMapper;
 import com.zhongzheng.modules.activity.mapper.ActivityConfigurationMapper;
+import com.zhongzheng.modules.activity.service.IActivityConfigurationCourseService;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationUseService;
 import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
@@ -45,6 +46,9 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     @Autowired
     private IActivityConfigurationUseService activityConfigurationUseService;
 
+    @Autowired
+    private IActivityConfigurationCourseService activityConfigurationCourseService;
+
     @Override
     public ActivityConfigurationVo queryById(Long id){
         return this.baseMapper.selectConfigures(id);
@@ -57,6 +61,8 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
         for (ActivityConfigurationVo activityConfigurationVo : activityConfigurationVos) {
             Integer num  = activityConfigurationUseService.countConfig(activityConfigurationVo.getId());
             activityConfigurationVo.setUserNumber(num);
+            List<Long> course = activityConfigurationCourseService.selectConfiguraList(activityConfigurationVo.getId());
+            activityConfigurationVo.setCourses(course);
         }
 
         TableDataInfo<ActivityConfigurationVo> list = new TableDataInfo<>();

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

@@ -107,8 +107,13 @@ public class ActivityConfigurationVo {
 
 
 	/** 绑定课程 */
+	/*@Excel(name = "绑定课程")
+	@ApiModelProperty("绑定课程")
+	private List<CourseVo> courses;*/
+
+
 	@Excel(name = "绑定课程")
 	@ApiModelProperty("绑定课程")
-	private List<CourseVo> courses;
+	private List<Long> courses;
 
 }

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

@@ -21,4 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                )
     </insert>
 
+    <select id="selectConfiguraList" parameterType="map" resultType="long">
+        select course_id from activity_configuration_course WHERE 1=1 AND configuration_id =#{id}
+
+    </select>
+
 </mapper>

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

@@ -94,8 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectConfiguraList" parameterType="com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo" resultMap="ActivityConfigurationResultVO">
         SELECT
-        c.*,
-        s.*
+        c.*
         FROM
         activity_configuration c
         LEFT JOIN activity_configuration_course f ON c.id = f.configuration_id