计划修改

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityGradeController.java

@@ -50,8 +50,8 @@ public class ActivityGradeController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<ActivityGradeVo> list(ActivityGradeQueryBo bo) {
         startPage();
-        List<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
-        return getDataTable(list);
+        TableDataInfo<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
+        return list;
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.activity.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
@@ -27,7 +28,7 @@ public interface IActivityGradeService extends IService<ActivityGrade> {
 	/**
 	 * 查询列表
 	 */
-	List<ActivityGradeVo> queryList(ActivityGradeQueryBo bo);
+	TableDataInfo<ActivityGradeVo> queryList(ActivityGradeQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入等级积分

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.bo.*;
 import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
@@ -63,7 +64,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     }
 
     @Override
-    public List<ActivityGradeVo> queryList(ActivityGradeQueryBo bo) {
+    public TableDataInfo<ActivityGradeVo> queryList(ActivityGradeQueryBo bo) {
         LambdaQueryWrapper<ActivityGrade> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getGrade() != null, ActivityGrade::getGrade, bo.getGrade());
         lqw.like(StrUtil.isNotBlank(bo.getGradeName()), ActivityGrade::getGradeName, bo.getGradeName());
@@ -74,11 +75,12 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         List<ActivityGrade> list = this.list(lqw);
         List<ActivityGradeVo> activityGradeVos = selectGradeCourse(list);
         List<ActivityGradeVo> activityGradeVos1 = entity2Vo(activityGradeVos);
-        for (ActivityGradeVo activityGradeVo : activityGradeVos1) {
-            Integer num = userService.selectUserNum(activityGradeVo.getGrade());
-            activityGradeVo.setUserNum(num);
-        }
-        return activityGradeVos1;
+        TableDataInfo<ActivityGradeVo> listData = new TableDataInfo<>();
+        listData.setCode(200);
+        listData.setMsg("查询成功");
+        listData.setRows(activityGradeVos1);
+        listData.setTotal(baseMapper.selectCount(lqw));
+        return listData;
     }
 
     /**
@@ -96,7 +98,15 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
 
     private List<ActivityGradeVo> selectGradeCourse(List<ActivityGrade> list) {
         List<ActivityGradeVo> activityGradeVos = entity2GradeVo(list);
-        activityGradeVos.stream().forEach(a -> a.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(a.getId())));
+        for (ActivityGradeVo activityGradeVo : activityGradeVos) {
+            Integer num = userService.selectUserNum(activityGradeVo.getGrade());
+            activityGradeVo.setUserNum(num);
+        }
+        activityGradeVos.stream().forEach(a -> {
+            a.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(a.getId()));
+
+        });
+
         return activityGradeVos;
     }
 

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

@@ -49,7 +49,7 @@ public class ActivityGradePrivilegeVo {
 
 	@Excel(name = "关联优惠课程")
 	@ApiModelProperty("关联优惠课程")
-	private List<CourseVo> courseVo;
+	private List<Long> courseVo;
 
 	/** 0删除 1使用 */
 	@ApiModelProperty("0删除 1使用")

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

@@ -22,23 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTimeSum" column="end_time_sum"/>
         <result property="quantity" column="quantity"/>
         <result property="status" column="status"/>
-        <collection property="courseVo" javaType="java.util.List" resultMap="CourseResult"/>
+        <collection property="courseVo" ofType="Long">
+            <constructor>
+                <arg column="eid" />
+            </constructor>
+        </collection>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.domain.Course" id="CourseResult">
-        <result property="courseId" column="course_id"/>
-        <result property="categoryId" column="category_id"/>
-        <result property="price" column="price"/>
-        <result property="duration" column="duration"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
-        <result property="coverUrl" column="cover_url"/>
-        <result property="introduction" column="introduction"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="status" column="status"/>
-        <result property="teacherIds" column="teacher_ids"/>
-        <result property="courseName" column="course_name"/>
+        <result property="courseId" column="eid"/>
     </resultMap>
 
 
@@ -46,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectGradePriList" parameterType="Long" resultMap="ActivityGradePrivilegeVoResult">
         SELECT
             c.*,
-            e.*
+            e.course_id as eid
         FROM
             activity_grade_privilege c
                 LEFT JOIN activity_grade_privilege_coures f ON c.id = f.privilege_id