学科组管理

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

@@ -0,0 +1,139 @@
+package com.xjrsoft.module.textbook.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseCourseSubject;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.textbook.dto.*;
+import com.xjrsoft.module.textbook.entity.SubjectGroup;
+import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
+import com.xjrsoft.module.textbook.service.ISubjectGroupCourseService;
+import com.xjrsoft.module.textbook.service.ISubjectGroupService;
+import com.xjrsoft.module.textbook.vo.SubjectGroupCoursePageVo;
+import com.xjrsoft.module.textbook.vo.SubjectGroupPageVo;
+import com.xjrsoft.module.textbook.vo.SubjectGroupVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/textbook" + "/subjectGroup")
+@Api(value = "/textbook"  + "/subjectGroup",tags = "学科组管理代码")
+@AllArgsConstructor
+public class SubjectGroupController {
+
+
+    private final ISubjectGroupService subjectGroupService;
+
+    private final ISubjectGroupCourseService subjectGroupCourseService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学科组管理列表(分页)")
+    @SaCheckPermission("subjectgroup:detail")
+    public RT<PageOutput<SubjectGroupPageVo>> page(@Valid SubjectGroupPageDto dto){
+
+        MPJLambdaWrapper<SubjectGroup> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .select(SubjectGroup::getId)
+                .selectAs(XjrUser::getName,SubjectGroupPageVo::getLeaderUserIdCN)
+                .select(SubjectGroup.class,x -> VoToColumnUtil.fieldsToColumns(SubjectGroupPageVo.class).contains(x.getProperty()))
+                .leftJoin(XjrUser.class,XjrUser::getId,SubjectGroup::getLeaderUserId)
+                .orderByDesc(SubjectGroup::getId);
+        IPage<SubjectGroupPageVo> page = subjectGroupService.selectJoinListPage(ConventPage.getPage(dto),SubjectGroupPageVo.class, queryWrapper);
+        PageOutput<SubjectGroupPageVo> pageOutput = ConventPage.getPageOutput(page, SubjectGroupPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学科组管理信息")
+    @SaCheckPermission("subjectgroup:detail")
+    public RT<SubjectGroupVo> info(@RequestParam Long id){
+        SubjectGroup subjectGroup = subjectGroupService.getById(id);
+        if (subjectGroup == null) {
+           return RT.error("找不到此数据！");
+        }
+
+        MPJLambdaWrapper<SubjectGroupCourse> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .select(SubjectGroup::getId)
+                .selectAs(BaseCourseSubject::getName, SubjectGroupCoursePageVo::getCourseSubjectIdCN)
+                .select(SubjectGroupCourse.class,x -> VoToColumnUtil.fieldsToColumns(SubjectGroupCoursePageVo.class).contains(x.getProperty()))
+                .leftJoin(BaseCourseSubject.class,BaseCourseSubject::getId,SubjectGroupCourse::getCourseSubjectId)
+                .eq(SubjectGroupCourse::getSubjectGroupId,subjectGroup.getId())
+                .orderByDesc(SubjectGroupCourse::getId);
+
+        List<SubjectGroupCoursePageVo> subjectGroupCourseList = subjectGroupCourseService.selectJoinList(SubjectGroupCoursePageVo.class,queryWrapper);
+        SubjectGroupVo subjectGroupVo = BeanUtil.toBean(subjectGroup, SubjectGroupVo.class);
+        subjectGroupVo.setSubjectGroupCourseList(subjectGroupCourseList);
+        return RT.ok(subjectGroupVo);
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学科组管理")
+    @SaCheckPermission("subjectgroup:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSubjectGroupDto dto){
+        Boolean isSuccess = subjectGroupService.add(dto);
+        return RT.ok(isSuccess);
+    }
+
+    @PostMapping("/addCourse")
+    @ApiOperation(value = "新增学科组下面的课程")
+    @SaCheckPermission("subjectgroup:add")
+    public RT<Boolean> addCourse(@Valid @RequestBody AddCourseToSubjectGroupDto dto){
+        Boolean isSuccess = subjectGroupService.addCourse(dto);
+        return RT.ok(isSuccess);
+    }
+
+
+    @PutMapping
+    @ApiOperation(value = "修改学科组管理")
+    @SaCheckPermission("subjectgroup:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSubjectGroupDto dto){
+        SubjectGroup subjectGroup = BeanUtil.toBean(dto, SubjectGroup.class);
+        return RT.ok(subjectGroupService.updateById(subjectGroup));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学科组管理")
+    @SaCheckPermission("subjectgroup:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        for(Long id : ids){
+            LambdaQueryWrapper<SubjectGroupCourse> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper
+                    .eq(SubjectGroupCourse::getSubjectGroupId,id);
+            Long count = subjectGroupCourseService.count(queryWrapper);
+            if(count > 0){
+                throw new MyException("学科组下面有课程");
+            }
+        }
+        return RT.ok(subjectGroupService.removeBatchByIds(ids));
+    }
+
+    @DeleteMapping("/deleteCourse")
+    @ApiOperation(value = "删除学科组下面的课程")
+    @SaCheckPermission("subjectgroup:delete")
+    public RT<Boolean> deleteCourse(@Valid @RequestBody List<Long> ids){
+        return RT.ok(subjectGroupCourseService.removeBatchByIds(ids));
+    }
+
+}

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

@@ -0,0 +1,101 @@
+package com.xjrsoft.module.textbook.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseCourseSubject;
+import com.xjrsoft.module.textbook.dto.AddSubjectGroupCourseDto;
+import com.xjrsoft.module.textbook.dto.SubjectGroupCoursePageDto;
+import com.xjrsoft.module.textbook.dto.UpdateSubjectGroupCourseDto;
+import com.xjrsoft.module.textbook.entity.SubjectGroup;
+import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
+import com.xjrsoft.module.textbook.service.ISubjectGroupCourseService;
+import com.xjrsoft.module.textbook.vo.SubjectGroupCoursePageVo;
+import com.xjrsoft.module.textbook.vo.SubjectGroupCourseVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 学科组课程管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/textbook" + "/subjectGroupCourse")
+@Api(value = "/textbook"  + "/subjectGroupCourse",tags = "学科组课程管理")
+@AllArgsConstructor
+public class SubjectGroupCourseController {
+
+
+    private final ISubjectGroupCourseService subjectGroupCourseService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学科组课程管理(分页)")
+    @SaCheckPermission("subjectgroupcourse:detail")
+    public RT<PageOutput<SubjectGroupCoursePageVo>> page(@Valid SubjectGroupCoursePageDto dto){
+        MPJLambdaWrapper<SubjectGroupCourse> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .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(ObjectUtil.isNotNull(dto.getSubjectGroupId()) && dto.getSubjectGroupId() > 0, SubjectGroupCourse::getSubjectGroupId,dto.getSubjectGroupId())
+                .orderByDesc(SubjectGroupCourse::getId);
+        IPage<SubjectGroupCoursePageVo> page = subjectGroupCourseService.selectJoinListPage(ConventPage.getPage(dto),SubjectGroupCoursePageVo.class, queryWrapper);
+        PageOutput<SubjectGroupCoursePageVo> pageOutput = ConventPage.getPageOutput(page, SubjectGroupCoursePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学科组课程管理信息")
+    @SaCheckPermission("subjectgroupcourse:detail")
+    public RT<SubjectGroupCourseVo> info(@RequestParam Long id){
+        SubjectGroupCourse subjectGroupCourse = subjectGroupCourseService.getById(id);
+        if (subjectGroupCourse == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(subjectGroupCourse, SubjectGroupCourseVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学科组课程管理")
+    @SaCheckPermission("subjectgroupcourse:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSubjectGroupCourseDto dto){
+        SubjectGroupCourse subjectGroupCourse = BeanUtil.toBean(dto, SubjectGroupCourse.class);
+        boolean isSuccess = subjectGroupCourseService.save(subjectGroupCourse);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学科组课程管理")
+    @SaCheckPermission("subjectgroupcourse:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSubjectGroupCourseDto dto){
+
+        SubjectGroupCourse subjectGroupCourse = BeanUtil.toBean(dto, SubjectGroupCourse.class);
+        return RT.ok(subjectGroupCourseService.updateById(subjectGroupCourse));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学科组课程管理")
+    @SaCheckPermission("subjectgroupcourse:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(subjectGroupCourseService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/AddCourseToSubjectGroupDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class AddCourseToSubjectGroupDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private List<Long> courseSubjectIds;
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/AddSubjectGroupCourseDto.java

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class AddSubjectGroupCourseDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private Long courseSubjectId;
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/AddSubjectGroupDto.java

@@ -0,0 +1,47 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class AddSubjectGroupDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 组名
+    */
+    @ApiModelProperty("组名")
+    private String groupName;
+    /**
+    * 组长用户编号
+    */
+    @ApiModelProperty("组长用户编号")
+    private Long leaderUserId;
+    /**
+     * 学科组课程管理信息
+     */
+    @ApiModelProperty("学科组课程管理信息")
+    private List<Long> subjectGroupCourseIds;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/DeleteCourseToSubjectGroupDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class DeleteCourseToSubjectGroupDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private List<Long> courseSubjectIds;
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/SubjectGroupCoursePageDto.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.textbook.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 学科组管理分页查询入参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SubjectGroupCoursePageDto extends PageInput {
+
+    /**
+     * 学科组管理编号(subject_group)
+     */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/SubjectGroupPageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.textbook.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学科组管理分页查询入参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SubjectGroupPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/UpdateSubjectGroupCourseDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class UpdateSubjectGroupCourseDto extends AddSubjectGroupCourseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/textbook/dto/UpdateSubjectGroupDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class UpdateSubjectGroupDto extends AddSubjectGroupDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/textbook/entity/SubjectGroup.java

@@ -0,0 +1,98 @@
+package com.xjrsoft.module.textbook.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+@TableName("subject_group")
+@ApiModel(value = "subject_group", description = "学科组管理")
+public class SubjectGroup implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 组名
+    */
+    @ApiModelProperty("组名")
+    private String groupName;
+    /**
+    * 组长用户编号
+    */
+    @ApiModelProperty("组长用户编号")
+    private Long leaderUserId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

src/main/java/com/xjrsoft/module/textbook/entity/SubjectGroupCourse.java

@@ -0,0 +1,93 @@
+package com.xjrsoft.module.textbook.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+@TableName("subject_group_course")
+@ApiModel(value = "subject_group_course", description = "学科组管理")
+public class SubjectGroupCourse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private Long courseSubjectId;
+
+
+}

src/main/java/com/xjrsoft/module/textbook/mapper/SubjectGroupCourseMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Mapper
+public interface SubjectGroupCourseMapper extends MPJBaseMapper<SubjectGroupCourse> {
+
+}

src/main/java/com/xjrsoft/module/textbook/mapper/SubjectGroupMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.textbook.entity.SubjectGroup;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Mapper
+public interface SubjectGroupMapper extends MPJBaseMapper<SubjectGroup> {
+
+}

src/main/java/com/xjrsoft/module/textbook/service/ISubjectGroupCourseService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+
+public interface ISubjectGroupCourseService extends MPJBaseService<SubjectGroupCourse> {
+}

src/main/java/com/xjrsoft/module/textbook/service/ISubjectGroupService.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.textbook.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.dto.AddCourseToSubjectGroupDto;
+import com.xjrsoft.module.textbook.dto.AddSubjectGroupDto;
+import com.xjrsoft.module.textbook.entity.SubjectGroup;
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+
+public interface ISubjectGroupService extends MPJBaseService<SubjectGroup> {
+    Boolean add(AddSubjectGroupDto dto);
+
+    Boolean addCourse(AddCourseToSubjectGroupDto dto);
+
+}

src/main/java/com/xjrsoft/module/textbook/service/impl/SubjectGroupCourseServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
+import com.xjrsoft.module.textbook.mapper.SubjectGroupCourseMapper;
+import com.xjrsoft.module.textbook.service.ISubjectGroupCourseService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SubjectGroupCourseServiceImpl extends MPJBaseServiceImpl<SubjectGroupCourseMapper, SubjectGroupCourse> implements ISubjectGroupCourseService {
+}

src/main/java/com/xjrsoft/module/textbook/service/impl/SubjectGroupServiceImpl.java

@@ -0,0 +1,75 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.module.textbook.dto.AddCourseToSubjectGroupDto;
+import com.xjrsoft.module.textbook.dto.AddSubjectGroupDto;
+import com.xjrsoft.module.textbook.entity.SubjectGroup;
+import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
+import com.xjrsoft.module.textbook.mapper.SubjectGroupMapper;
+import com.xjrsoft.module.textbook.service.ISubjectGroupCourseService;
+import com.xjrsoft.module.textbook.service.ISubjectGroupService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+* @title: 学科组管理
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SubjectGroupServiceImpl extends MPJBaseServiceImpl<SubjectGroupMapper, SubjectGroup> implements ISubjectGroupService {
+
+    private final ISubjectGroupCourseService subjectGroupCourseService;
+
+    @Override
+    @Transactional
+    public Boolean add(AddSubjectGroupDto dto) {
+        SubjectGroup subjectGroup = BeanUtil.toBean(dto, SubjectGroup.class);
+        boolean isSuccess = this.save(subjectGroup);
+
+        LambdaQueryWrapper<SubjectGroup> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .select(SubjectGroup::getId)
+                .eq(SubjectGroup::getGroupName,dto.getGroupName())
+                .eq(SubjectGroup::getLeaderUserId,dto.getLeaderUserId());
+        SubjectGroup result = this.getOne(queryWrapper);
+        //新增学科组的时候同时添加了学科课程
+        if(ObjectUtil.isNotNull(dto.getSubjectGroupCourseIds()) && dto.getSubjectGroupCourseIds().size() > 0 && ObjectUtil.isNotNull(result)){
+            for (Long subjectGroupCourseId : dto.getSubjectGroupCourseIds()) {
+                SubjectGroupCourse subjectGroupCourse = new SubjectGroupCourse();
+                subjectGroupCourse.setSubjectGroupId(result.getId());
+                subjectGroupCourse.setCourseSubjectId(subjectGroupCourseId);
+                isSuccess = subjectGroupCourseService.save(subjectGroupCourse);
+                if(!isSuccess){
+                    throw new MyException("出现未知错误，联系管理员");
+                }
+            }
+        }
+        return isSuccess;
+    }
+
+    @Override
+    @Transactional
+    public Boolean addCourse(AddCourseToSubjectGroupDto dto) {
+        boolean isSuccess = false;
+        if(ObjectUtil.isNotNull(dto.getCourseSubjectIds()) && dto.getCourseSubjectIds().size() > 0){
+            for (Long courseSubjectId:dto.getCourseSubjectIds()) {
+                SubjectGroupCourse subjectGroupCourse = new SubjectGroupCourse();
+                subjectGroupCourse.setSubjectGroupId(dto.getSubjectGroupId());
+                subjectGroupCourse.setCourseSubjectId(courseSubjectId);
+                isSuccess = subjectGroupCourseService.save(subjectGroupCourse);
+                if(!isSuccess){
+                    throw new MyException("出现未知错误，联系管理员");
+                }
+            }
+        }
+        return isSuccess;
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学科组管理分页列表出参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class SubjectGroupCoursePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+     * 学科组管理编号(subject_group)
+     */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private String subjectGroupIdCN;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private Long courseSubjectId;
+    /**
+     * 课程编号(base_course_subject)
+     */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private String courseSubjectIdCN;
+
+}

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

@@ -0,0 +1,44 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学科组管理表单出参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class SubjectGroupCourseVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private Long courseSubjectId;
+
+
+
+}

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

@@ -0,0 +1,41 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学科组管理分页列表出参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class SubjectGroupPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 组名
+    */
+    @ApiModelProperty("组名")
+    private String groupName;
+    /**
+    * 组长用户编号
+    */
+    @ApiModelProperty("组长用户编号")
+    private Long leaderUserId;
+    /**
+     * 组长用户编号
+     */
+    @ApiModelProperty("组长用户编号")
+    private String leaderUserIdCN;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,49 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 学科组管理表单出参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class SubjectGroupVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 组名
+    */
+    @ApiModelProperty("组名")
+    private String groupName;
+    /**
+    * 组长用户编号
+    */
+    @ApiModelProperty("组长用户编号")
+    private Long leaderUserId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /**
+     * 学科组课程管理信息
+     */
+    @ApiModelProperty("学科组课程管理信息")
+    private List<SubjectGroupCoursePageVo> subjectGroupCourseList;
+
+}

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1162,4 +1162,63 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 学科组管理
+     *
+     */
+    @Test
+    public void gcSubjectGroup() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("subject_group");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("textbook");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+    /**
+     * 学科组课程管理
+     *
+     */
+    @Test
+    public void gcSubjectGroupCourse() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("subject_group_course");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("textbook");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
 }