he2802 před 4 roky
rodič
revize
ac76822eb6

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionBankServiceImpl.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.bank.mapper.QuestionBankMapper;
 import com.zhongzheng.modules.bank.service.IQuestionBankService;
 import com.zhongzheng.modules.bank.vo.QuestionBankVo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
+import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.mapper.CourseMapper;
 import com.zhongzheng.modules.course.service.IMajorCategoryService;
 import com.zhongzheng.modules.course.vo.CourseVo;
@@ -66,6 +67,7 @@ public class QuestionBankServiceImpl extends ServiceImpl<QuestionBankMapper, Que
         lqw.in(bo.getStatus() != null, QuestionBank::getStatus, bo.getStatus());
         lqw.eq(bo.getTypeId() != null, QuestionBank::getTypeId, bo.getTypeId());
         lqw.eq(StrUtil.isNotBlank(bo.getTeacherIds()), QuestionBank::getTeacherIds, bo.getTeacherIds());
+        lqw.orderByDesc(QuestionBank::getSort);
         return entity2Vo(this.list(lqw));
     }
 

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseAddBo.java

@@ -61,4 +61,7 @@ public class CourseAddBo {
     @ApiModelProperty("课程名称")
     @NotBlank(message = "课程名称不能为空")
     private String courseName;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEditBo.java

@@ -69,4 +69,8 @@ public class CourseEditBo {
     @ApiModelProperty("课程名称")
     @NotBlank(message = "课程名称不能为空")
     private String courseName;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -75,4 +75,8 @@ public class CourseQueryBo extends BaseEntity {
 
 	private Integer currIndex;
 
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java

@@ -75,5 +75,8 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private String categoryName;
 
+    /** 排序 */
+    private String sort;
+
 
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.bo.CourseAddBo;
@@ -65,6 +66,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         lqw.in(bo.getStatus() != null, Course::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getTeacherIds()), Course::getTeacherIds, bo.getTeacherIds());
         lqw.like(StrUtil.isNotBlank(bo.getCourseName()), Course::getCourseName, bo.getCourseName());
+        lqw.orderByDesc(Course::getSort);
         return entity2Vo(this.list(lqw));
     }
 

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chapterNum" column="chapter_num"/>
         <result property="sectionNum" column="section_num"/>
         <result property="categoryName" column="category_name"/>
+        <result property="sort" column="sort"/>
     </resultMap>