From 3d70bd035693dd84e007a8e3aa577cfcea4e586c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E7=A0=81-=E6=96=B9=E6=99=93=E8=BE=89?= Date: Mon, 2 Feb 2026 20:40:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E7=BB=91=E5=AE=9A=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=A6=E6=A0=A1=E3=80=81=E5=B9=B4=E7=BA=A7?= =?UTF-8?q?=E3=80=81=E7=8F=AD=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改 selectByMemberId 接口返回 StudentVo 而非 PgStudent, 包含学校名称、年级名称、班级名称等关联数据 --- .../dromara/pangu/member/controller/PgMemberController.java | 6 +++--- .../pangu/student/controller/PgStudentController.java | 4 ++-- .../dromara/pangu/student/service/IPgStudentService.java | 4 ++-- .../pangu/student/service/impl/PgStudentServiceImpl.java | 6 ++++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/member/controller/PgMemberController.java b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/member/controller/PgMemberController.java index 8a09e79..c6c5bd6 100644 --- a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/member/controller/PgMemberController.java +++ b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/member/controller/PgMemberController.java @@ -10,7 +10,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.pangu.member.domain.PgMember; import org.dromara.pangu.member.service.IPgMemberService; -import org.dromara.pangu.student.domain.PgStudent; +import org.dromara.pangu.student.domain.vo.StudentVo; import org.dromara.pangu.student.service.IPgStudentService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -113,10 +113,10 @@ public class PgMemberController extends BaseController { } /** - * 获取会员已绑定的学生列表 + * 获取会员已绑定的学生列表(包含学校、年级、班级名称) */ @GetMapping("/{memberId}/students") - public R> getMemberStudents(@PathVariable Long memberId) { + public R> getMemberStudents(@PathVariable Long memberId) { return R.ok(studentService.selectByMemberId(memberId)); } diff --git a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/controller/PgStudentController.java b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/controller/PgStudentController.java index 67a4759..07354f4 100644 --- a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/controller/PgStudentController.java +++ b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/controller/PgStudentController.java @@ -99,10 +99,10 @@ public class PgStudentController extends BaseController { } /** - * 查询会员已绑定的学生列表 + * 查询会员已绑定的学生列表(包含学校、年级、班级名称) */ @GetMapping("/byMember/{memberId}") - public R> listByMemberId(@PathVariable Long memberId) { + public R> listByMemberId(@PathVariable Long memberId) { return R.ok(studentService.selectByMemberId(memberId)); } diff --git a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/IPgStudentService.java b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/IPgStudentService.java index d106851..d9a72ff 100644 --- a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/IPgStudentService.java +++ b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/IPgStudentService.java @@ -33,9 +33,9 @@ public interface IPgStudentService { TableDataInfo selectAvailableStudents(String studentName, String studentNo, Long memberId, Long schoolId, PageQuery pageQuery); /** - * 查询会员已绑定的学生列表 + * 查询会员已绑定的学生列表(包含学校、年级、班级名称) */ - List selectByMemberId(Long memberId); + List selectByMemberId(Long memberId); /** * 批量绑定学生到会员 diff --git a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/impl/PgStudentServiceImpl.java b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/impl/PgStudentServiceImpl.java index af5890e..6b66423 100644 --- a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/impl/PgStudentServiceImpl.java +++ b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/student/service/impl/PgStudentServiceImpl.java @@ -243,15 +243,17 @@ public class PgStudentServiceImpl implements IPgStudentService { } @Override - public List selectByMemberId(Long memberId) { + public List selectByMemberId(Long memberId) { if (memberId == null) { return List.of(); } - return baseMapper.selectList( + List students = baseMapper.selectList( new LambdaQueryWrapper() .eq(PgStudent::getMemberId, memberId) .orderByDesc(PgStudent::getCreateTime) ); + // 转换为 VO,包含学校、年级、班级名称 + return convertToVoList(students); } @Override