submit

zhichen-system/src/main/java/com/zhichen/modules/activity/bo/ConsultationQueryBo.java

@@ -1,5 +1,7 @@
 package com.zhichen.modules.activity.bo;
 
+import com.zhichen.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,7 +13,19 @@ import java.io.Serializable;
  * @date 2023-03-15
  */
 @Data
-public class ConsultationQueryBo implements Serializable {
+public class ConsultationQueryBo extends BaseEntity {
+    /** 分页大小 */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+    /** 当前页数 */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+    /** 排序列 */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+    /** 排序的方向desc或者asc */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
 
     /** 新闻标题 */
     private String title;

zhichen-system/src/main/java/com/zhichen/modules/activity/service/impl/ConsultationServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhichen.common.utils.DateUtils;
 import com.zhichen.modules.activity.bo.ConsultationAddBo;
 import com.zhichen.modules.activity.bo.ConsultationDelBo;
@@ -14,10 +15,13 @@ import com.zhichen.modules.activity.domain.Consultation;
 import com.zhichen.modules.activity.mapper.ConsultationMapper;
 import com.zhichen.modules.activity.service.IConsultationService;
 import com.zhichen.modules.activity.vo.ConsultationVo;
+import com.zhichen.modules.course.domain.Course;
+import com.zhichen.modules.course.vo.CourseVo;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -59,7 +63,7 @@ public class ConsultationServiceImpl extends ServiceImpl<ConsultationMapper, Con
                 .eq(ObjectUtils.isNotNull(bo.getType()), Consultation::getType, bo.getType())
                 .like(StringUtils.isNotBlank(bo.getTitle()), Consultation::getTitle, bo.getTitle())
                 .orderByDesc(Consultation::getSort));
-        return list.stream().map(x -> BeanUtil.toBean(x,ConsultationVo.class)).collect(Collectors.toList());
+        return entity2Vo(list);
     }
 
     @Override
@@ -73,4 +77,24 @@ public class ConsultationServiceImpl extends ServiceImpl<ConsultationMapper, Con
         Consultation consultation = BeanUtil.toBean(bo, Consultation.class);
         return updateById(consultation);
     }
+
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<ConsultationVo> entity2Vo(Collection<Consultation> collection) {
+        List<ConsultationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ConsultationVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Consultation> page = (Page<Consultation>)collection;
+            Page<ConsultationVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
 }

zhichen-system/src/main/java/com/zhichen/modules/course/service/impl/CourseServiceImpl.java

@@ -247,7 +247,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     }
 
     @Override
-    public List<CourseVo> selectList(CourseQueryBo bo) {
+    public List<CourseVo>  selectList(CourseQueryBo bo) {
         return courseMapper.selectCourseList(bo);
     }