/textbook/subjectGroup/page 返回学科组下课程的集合

src/main/java/com/xjrsoft/module/textbook/controller/SubjectGroupController.java

@@ -58,6 +58,21 @@ public class SubjectGroupController {
                 .leftJoin(XjrUser.class,XjrUser::getId,SubjectGroup::getLeaderUserId)
                 .orderByDesc(SubjectGroup::getId);
         IPage<SubjectGroupPageVo> page = subjectGroupService.selectJoinListPage(ConventPage.getPage(dto),SubjectGroupPageVo.class, queryWrapper);
+        for (SubjectGroupPageVo subjectGroupPageVo : page.getRecords()) {
+            MPJLambdaWrapper<SubjectGroupCourse> queryWrapper1 = new MPJLambdaWrapper<>();
+            queryWrapper1
+                    .select(SubjectGroupCourse::getId)
+                    .selectAs(BaseCourseSubject::getName, SubjectGroupCoursePageVo::getCourseSubjectIdCN)
+                    .selectAs(SubjectGroup::getGroupName, SubjectGroupCoursePageVo::getSubjectGroupIdCN)
+                    .select(SubjectGroupCourse.class,x -> VoToColumnUtil.fieldsToColumns(SubjectGroupCoursePageVo.class).contains(x.getProperty()))
+                    .leftJoin(BaseCourseSubject.class,BaseCourseSubject::getId,SubjectGroupCourse::getCourseSubjectId)
+                    .leftJoin(SubjectGroup.class,SubjectGroup::getId,SubjectGroupCourse::getSubjectGroupId)
+                    .eq(SubjectGroupCourse::getSubjectGroupId,subjectGroupPageVo.getId())
+                    .orderByDesc(SubjectGroupCourse::getId);
+
+            List<SubjectGroupCoursePageVo> subjectGroupCourseList = subjectGroupCourseService.selectJoinList(SubjectGroupCoursePageVo.class,queryWrapper1);
+            subjectGroupPageVo.setSubjectGroupCourseList(subjectGroupCourseList);
+        }
         PageOutput<SubjectGroupPageVo> pageOutput = ConventPage.getPageOutput(page, SubjectGroupPageVo.class);
         return RT.ok(pageOutput);
     }
@@ -73,7 +88,7 @@ public class SubjectGroupController {
 
         MPJLambdaWrapper<SubjectGroupCourse> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
-                .select(SubjectGroup::getId)
+                .select(SubjectGroupCourse::getId)
                 .selectAs(BaseCourseSubject::getName, SubjectGroupCoursePageVo::getCourseSubjectIdCN)
                 .select(SubjectGroupCourse.class,x -> VoToColumnUtil.fieldsToColumns(SubjectGroupCoursePageVo.class).contains(x.getProperty()))
                 .leftJoin(BaseCourseSubject.class,BaseCourseSubject::getId,SubjectGroupCourse::getCourseSubjectId)

src/main/java/com/xjrsoft/module/textbook/vo/SubjectGroupPageVo.java

@@ -3,6 +3,8 @@ package com.xjrsoft.module.textbook.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
 * @title: 学科组管理分页列表出参
 * @Author szs
@@ -37,5 +39,10 @@ public class SubjectGroupPageVo {
     */
     @ApiModelProperty("备注")
     private String remark;
+    /**
+     * 学科组课程管理信息
+     */
+    @ApiModelProperty("学科组课程管理信息")
+    private List<SubjectGroupCoursePageVo> subjectGroupCourseList;
 
 }