From f58cba4a9aaa4eb4a490c7754015ee68a00e0339 Mon Sep 17 00:00:00 2001
From: Asriya <16065048+asriya@user.noreply.gitee.com>
Date: Thu, 21 Aug 2025 09:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/controller/ClsController.java | 11 ++++++++++
 .../src/main/java/org/dromara/domain/Cls.java |  3 +++
 .../main/java/org/dromara/domain/Student.java |  2 +-
 .../java/org/dromara/mapper/ClsMapper.java    |  8 ++++---
 .../java/org/dromara/service/IClsService.java |  4 ++++
 .../org/dromara/service/impl/ClsService.java  | 12 +++++++----
 .../dromara/service/impl/StudentService.java  |  2 +-
 .../resources/mapper/system/ClsMapper.xml     | 21 ++++++++++++++++---
 .../resources/mapper/system/StudentMapper.xml |  5 +++--
 9 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/controller/ClsController.java b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/controller/ClsController.java
index 71b7b9d..8656b5a 100644
--- a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/controller/ClsController.java
+++ b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/controller/ClsController.java
@@ -1,7 +1,10 @@
 package org.dromara.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
 import org.dromara.common.Result;
+import org.dromara.common.core.domain.R;
+import org.dromara.domain.Cls;
 import org.dromara.domain.Cls;
 import org.dromara.service.IClsService;
 import org.springframework.web.bind.annotation.*;
@@ -65,4 +68,12 @@ public class ClsController {
         clsService.deleteById(id);
         return Result.success();
     }
+    /**
+     * 分页查询
+     */
+    @PostMapping("/selectPage")
+    public R<IPage<Cls>> selectPage(@RequestBody Cls cls) {
+        IPage<Cls> list = clsService.selectPage(cls);
+        return R.ok(list);
+    }
 }
diff --git a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Cls.java b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Cls.java
index 0d8e3fa..7697c1e 100644
--- a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Cls.java
+++ b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Cls.java
@@ -6,5 +6,8 @@ import lombok.Data;
 public class Cls {
     private Integer id;
     private String name;
+    private Integer num;
+    private Integer pageNum;
+    private Integer pageSize;
 
 }
diff --git a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Student.java b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Student.java
index cd3d487..0fe8ac5 100644
--- a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Student.java
+++ b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/domain/Student.java
@@ -15,7 +15,7 @@ public class Student {
     private Integer clsId;
     private Integer courseId;
     private String clsName;
-
+    private String avatar;
     private Integer pageNum;
     private Integer pageSize;
 }
diff --git a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/mapper/ClsMapper.java b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/mapper/ClsMapper.java
index 383bd3e..e447c5a 100644
--- a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/mapper/ClsMapper.java
+++ b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/mapper/ClsMapper.java
@@ -1,9 +1,12 @@
 package org.dromara.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.dromara.domain.Cls;
+import org.dromara.domain.Cls;
 
 import java.util.List;
 
@@ -11,13 +14,12 @@ public interface ClsMapper extends BaseMapper<Cls> {
     List<Cls> selectAll(Cls cls);
     @Select("select * from cls where id = #{id}")
     Cls selectById(Integer id);
-
     int insert(Cls cls);
-
     int updateById(Cls cls);
-
     @Delete("delete  from `cls` where id = #{id}")
     void deleteById(Integer id);
     @Select("select * from cls where username = #{username}")
     Cls selectByUsername(String username);
+
+    IPage<Cls> selectPage(@Param("cls") Cls cls, IPage<Cls> page);
 }
diff --git a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/IClsService.java b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/IClsService.java
index f5d7b48..bbc0df5 100644
--- a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/IClsService.java
+++ b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/IClsService.java
@@ -1,7 +1,10 @@
 package org.dromara.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.domain.Cls;
+import org.dromara.domain.Cls;
 
 import java.util.List;
 
@@ -22,4 +25,5 @@ public interface IClsService extends IService<Cls> {
 
     Cls selectById( Integer id);
 
+    IPage<Cls> selectPage(Cls cls);
 }
diff --git a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/ClsService.java b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/ClsService.java
index 52f3d5e..e8c5b39 100644
--- a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/ClsService.java
+++ b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/ClsService.java
@@ -1,20 +1,18 @@
 package org.dromara.service.impl;
 
 
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.dromara.domain.Cls;
-import org.dromara.domain.Student;
 import org.dromara.mapper.ClsMapper;
 import org.dromara.mapper.StudentMapper;
 import org.dromara.service.IClsService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 public class ClsService extends ServiceImpl<ClsMapper, Cls> implements IClsService {
@@ -48,6 +46,12 @@ public class ClsService extends ServiceImpl<ClsMapper, Cls> implements IClsServi
     public Cls selectById(Integer id) {
         return clsMapper.selectById(id);
     }
+    @Override
+    public IPage<Cls> selectPage(Cls cls) {
+        IPage<Cls> page = new Page<>(cls.getPageNum(), cls.getPageSize());
+        return clsMapper.selectPage(cls,page);
+    }
+
 
 }
 
diff --git a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/StudentService.java b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/StudentService.java
index c8ef9bc..40574ac 100644
--- a/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/StudentService.java
+++ b/ruoyi-modules/ruoyi-student/src/main/java/org/dromara/service/impl/StudentService.java
@@ -1,6 +1,5 @@
 package org.dromara.service.impl;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
@@ -11,6 +10,7 @@ import org.dromara.service.IStudentService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+
 import java.util.List;
 @Service
 public class StudentService implements IStudentService {
diff --git a/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/ClsMapper.xml b/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/ClsMapper.xml
index 57efa72..8753eab 100644
--- a/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/ClsMapper.xml
+++ b/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/ClsMapper.xml
@@ -4,12 +4,14 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.mapper.ClsMapper">
     <select id="selectAll" resultType="org.dromara.domain.Cls" parameterType="org.dromara.domain.Cls">
-        select *
+        select cls.id, cls.name,count(s.id) num
         from cls
+            left join student s on  cls.id = s.cls_id
         <where>
-            <if test="name != null">name like concat('%', #{name}, '%')</if>
+            <if test="name != null">cls.name like concat('%', #{name}, '%')</if>
         </where>
-        order by id desc
+        group by cls.id,cls.name
+        order by cls.id desc
     </select>
     <insert id="insert" parameterType="org.dromara.domain.Cls">
         insert into `cls` (name)
@@ -21,4 +23,17 @@
         set name= #{name}
         where id = #{id}
     </update>
+
+    <select id="selectPage" resultType="org.dromara.domain.Cls">
+        select c.id,
+        c.name,
+        count(1) num
+        from cls as c
+        left join student as s on s.cls_id = c.id
+        <where>
+            <if test="cls.name != null">c.name like concat('%', #{cls.name}, '%')</if>
+        </where>
+        group by c.id ,c.name
+        order by c.id desc
+    </select>
 </mapper>
diff --git a/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/StudentMapper.xml b/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/StudentMapper.xml
index 8fb3ab2..36ccc8b 100644
--- a/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/StudentMapper.xml
+++ b/ruoyi-modules/ruoyi-student/src/main/resources/mapper/system/StudentMapper.xml
@@ -48,8 +48,8 @@
     </select>
 
     <insert id="insert" parameterType="org.dromara.domain.Student">
-        insert into `student` (username, password, role, name, age, sex, address,  cls_id, course_id)
-        values (#{username}, #{password}, #{role}, #{name}, #{age}, #{sex}, #{address}, #{clsId}, #{courseId})
+        insert into `student` (username, password, role, name, age, sex, avatar,address,  cls_id, course_id)
+        values (#{username}, #{password}, #{role}, #{name}, #{age}, #{sex},#{avatar}, #{address}, #{clsId}, #{courseId})
     </insert>
 
     <update id="updateById" parameterType="org.dromara.domain.Student">
@@ -60,6 +60,7 @@
             name= #{name},
             age= #{age},
             sex= #{sex},
+            avatar= #{avatar},
             address= #{address},
             cls_id= #{clsId},
             course_id= #{courseId}