From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java b/src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java
index 3ebb9ac..abc041f 100644
--- a/src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java
+++ b/src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java
@@ -1,17 +1,23 @@
package com.ycl.jxkg.mapper;
-import com.ycl.jxkg.domain.Subject;
-import com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.jxkg.domain.entity.Subject;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectResponseVO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
-public interface SubjectMapper extends BaseMapper<Subject> {
+public interface SubjectMapper extends BaseMapper<Subject> {
List<Subject> getSubjectByLevel(Integer level);
List<Subject> allSubject();
- List<Subject> page(SubjectPageRequestVO requestVM);
+ List<SubjectResponseVO> page(SubjectPageRequestVO requestVM);
+
+ @Select("select ifnull(count(*) + 1, 1) from t_subject where deleted = 0")
+ Integer getItemOrder();
}
--
Gitblit v1.8.0