班级合并

src/main/java/com/xjrsoft/module/base/controller/BaseClassMergeController.java

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.base.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.dto.AddBaseClassMergeDto;
+import com.xjrsoft.module.base.dto.UpdateBaseClassMergeDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.xjrsoft.common.annotation.XjrLog;
+
+import com.xjrsoft.module.base.dto.BaseClassMergePageDto;
+import com.xjrsoft.module.base.entity.BaseClassMerge;
+import com.xjrsoft.module.base.service.IBaseClassMergeService;
+import com.xjrsoft.module.base.vo.BaseClassMergePageVo;
+
+import com.xjrsoft.module.base.vo.BaseClassMergeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 班级合并
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/base" + "/baseClassMerge")
+@Api(value = "/base"  + "/baseClassMerge",tags = "班级合并代码")
+@AllArgsConstructor
+public class BaseClassMergeController {
+
+
+    private final IBaseClassMergeService baseClassMergeService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="班级合并列表(分页)")
+    @SaCheckPermission("baseclassmerge:detail")
+    @XjrLog(value = "班级合并列表(分页)")
+    public RT<PageOutput<BaseClassMergePageVo>> page(@Valid BaseClassMergePageDto dto){
+
+        LambdaQueryWrapper<BaseClassMerge> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseClassMerge::getId)
+                .select(BaseClassMerge.class,x -> VoToColumnUtil.fieldsToColumns(BaseClassMergePageVo.class).contains(x.getProperty()));
+        IPage<BaseClassMerge> page = baseClassMergeService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseClassMergePageVo> pageOutput = ConventPage.getPageOutput(page, BaseClassMergePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询班级合并信息")
+    @SaCheckPermission("baseclassmerge:detail")
+    @XjrLog(value = "根据id查询班级合并信息")
+    public RT<BaseClassMergeVo> info(@RequestParam Long id){
+        BaseClassMerge baseClassMerge = baseClassMergeService.getByIdDeep(id);
+        if (baseClassMerge == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseClassMerge, BaseClassMergeVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增班级合并")
+    @SaCheckPermission("baseclassmerge:add")
+    @XjrLog(value = "新增班级合并")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseClassMergeDto dto){
+        BaseClassMerge baseClassMerge = BeanUtil.toBean(dto, BaseClassMerge.class);
+        boolean isSuccess = baseClassMergeService.add(baseClassMerge);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改班级合并")
+    @SaCheckPermission("baseclassmerge:edit")
+    @XjrLog(value = "修改班级合并")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseClassMergeDto dto){
+
+        BaseClassMerge baseClassMerge = BeanUtil.toBean(dto, BaseClassMerge.class);
+        return RT.ok(baseClassMergeService.update(baseClassMerge));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除班级合并")
+    @SaCheckPermission("baseclassmerge:delete")
+    @XjrLog(value = "删除班级合并")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseClassMergeService.delete(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/base/dto/AddBaseClassMergeDto.java

@@ -0,0 +1,49 @@
+package com.xjrsoft.module.base.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;
+import com.xjrsoft.module.base.entity.BaseClassMergeStudent;
+
+
+
+/**
+* @title: 班级合并
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+public class AddBaseClassMergeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 涉及学生人数
+    */
+    @ApiModelProperty("涉及学生人数")
+    private Integer studentCount;
+    /**
+    * 目标班级
+    */
+    @ApiModelProperty("目标班级")
+    private Long targetClassId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+
+    /**
+    * baseClassMergeStudent
+    */
+    @ApiModelProperty("baseClassMergeStudent子表")
+    private List<AddBaseClassMergeStudentDto> baseClassMergeStudentList;
+}

src/main/java/com/xjrsoft/module/base/dto/AddBaseClassMergeStudentDto.java

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.base.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 dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+public class AddBaseClassMergeStudentDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 班级合并id(base_class_merge)
+    */
+    @ApiModelProperty("班级合并id(base_class_merge)")
+    private Long baseClassMergeId;
+    /**
+    * 原有班级
+    */
+    @ApiModelProperty("原有班级")
+    private Long classId;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+
+}

src/main/java/com/xjrsoft/module/base/dto/BaseClassMergePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.base.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 dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseClassMergePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/base/dto/UpdateBaseClassMergeDto.java

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.base.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;
+import com.xjrsoft.module.base.entity.BaseClassMergeStudent;
+
+
+
+/**
+* @title: 班级合并
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseClassMergeDto extends AddBaseClassMergeDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/base/entity/BaseClassMerge.java

@@ -0,0 +1,100 @@
+package com.xjrsoft.module.base.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 dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+@TableName("base_class_merge")
+@ApiModel(value = "base_class_merge", description = "班级合并")
+public class BaseClassMerge 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;
+    /**
+    * 修改人id
+    */
+    @ApiModelProperty("修改人id")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记(0:未删除 1:已删除)
+    */
+    @ApiModelProperty("删除标记(0:未删除 1:已删除)")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Short deleteMark;
+    /**
+    * 有效标记(0:未启用 1:已启用)
+    */
+    @ApiModelProperty("有效标记(0:未启用 1:已启用)")
+    @TableField(fill = FieldFill.INSERT)
+    private Short enabledMark;
+    /**
+    * 涉及学生人数
+    */
+    @ApiModelProperty("涉及学生人数")
+    private Integer studentCount;
+    /**
+    * 目标班级
+    */
+    @ApiModelProperty("目标班级")
+    private Long targetClassId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+
+    /**
+    * baseClassMergeStudent
+    */
+    @ApiModelProperty("baseClassMergeStudent子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "baseClassMergeId")
+    private List<BaseClassMergeStudent> baseClassMergeStudentList;
+
+}

src/main/java/com/xjrsoft/module/base/entity/BaseClassMergeStudent.java

@@ -0,0 +1,93 @@
+package com.xjrsoft.module.base.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 dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+@TableName("base_class_merge_student")
+@ApiModel(value = "base_class_merge_student", description = "班级合并涉及学生")
+public class BaseClassMergeStudent 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;
+    /**
+    * 修改人id
+    */
+    @ApiModelProperty("修改人id")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记(0:未删除 1:已删除)
+    */
+    @ApiModelProperty("删除标记(0:未删除 1:已删除)")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Short deleteMark;
+    /**
+    * 有效标记(0:未启用 1:已启用)
+    */
+    @ApiModelProperty("有效标记(0:未启用 1:已启用)")
+    @TableField(fill = FieldFill.INSERT)
+    private Short enabledMark;
+    /**
+    * 班级合并id(base_class_merge)
+    */
+    @ApiModelProperty("班级合并id(base_class_merge)")
+    private Long baseClassMergeId;
+    /**
+    * 原有班级
+    */
+    @ApiModelProperty("原有班级")
+    private Long classId;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+
+
+}

src/main/java/com/xjrsoft/module/base/mapper/BaseClassMergeMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.base.entity.BaseClassMerge;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 班级合并
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Mapper
+public interface BaseClassMergeMapper extends MPJBaseMapper<BaseClassMerge> {
+
+}

src/main/java/com/xjrsoft/module/base/mapper/BaseClassMergeStudentMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.base.entity.BaseClassMergeStudent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 班级合并涉及学生
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Mapper
+public interface BaseClassMergeStudentMapper extends MPJBaseMapper<BaseClassMergeStudent> {
+
+}

src/main/java/com/xjrsoft/module/base/service/IBaseClassMergeService.java

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.base.entity.BaseClassMerge;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 班级合并
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+
+public interface IBaseClassMergeService extends MPJBaseService<BaseClassMerge> {
+    /**
+    * 新增
+    *
+    * @param baseClassMerge
+    * @return
+    */
+    Boolean add(BaseClassMerge baseClassMerge);
+
+    /**
+    * 更新
+    *
+    * @param baseClassMerge
+    * @return
+    */
+    Boolean update(BaseClassMerge baseClassMerge);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassMergeServiceImpl.java

@@ -0,0 +1,88 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.base.entity.BaseClassMergeStudent;
+import com.xjrsoft.module.base.mapper.BaseClassMergeStudentMapper;
+import com.xjrsoft.module.base.entity.BaseClassMerge;
+import com.xjrsoft.module.base.mapper.BaseClassMergeMapper;
+import com.xjrsoft.module.base.service.IBaseClassMergeService;
+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 dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseClassMergeServiceImpl extends MPJBaseServiceImpl<BaseClassMergeMapper, BaseClassMerge> implements IBaseClassMergeService {
+    private final BaseClassMergeMapper baseClassMergeBaseClassMergeMapper;
+
+    private final BaseClassMergeStudentMapper baseClassMergeBaseClassMergeStudentMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(BaseClassMerge baseClassMerge) {
+        baseClassMergeBaseClassMergeMapper.insert(baseClassMerge);
+        for (BaseClassMergeStudent baseClassMergeStudent : baseClassMerge.getBaseClassMergeStudentList()) {
+            baseClassMergeStudent.setBaseClassMergeId(baseClassMerge.getId());
+            baseClassMergeBaseClassMergeStudentMapper.insert(baseClassMergeStudent);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(BaseClassMerge baseClassMerge) {
+        baseClassMergeBaseClassMergeMapper.updateById(baseClassMerge);
+        //********************************* BaseClassMergeStudent  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<BaseClassMergeStudent> baseClassMergeStudentList = baseClassMergeBaseClassMergeStudentMapper.selectList(Wrappers.lambdaQuery(BaseClassMergeStudent.class).eq(BaseClassMergeStudent::getBaseClassMergeId, baseClassMerge.getId()).select(BaseClassMergeStudent::getId));
+            List<Long> baseClassMergeStudentIds = baseClassMergeStudentList.stream().map(BaseClassMergeStudent::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> baseClassMergeStudentOldIds = baseClassMerge.getBaseClassMergeStudentList().stream().map(BaseClassMergeStudent::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> baseClassMergeStudentRemoveIds = baseClassMergeStudentIds.stream().filter(item -> !baseClassMergeStudentOldIds.contains(item)).collect(Collectors.toList());
+
+            for (BaseClassMergeStudent baseClassMergeStudent : baseClassMerge.getBaseClassMergeStudentList()) {
+                //如果不等于空则修改
+                if (baseClassMergeStudent.getId() != null) {
+                    baseClassMergeBaseClassMergeStudentMapper.updateById(baseClassMergeStudent);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    baseClassMergeStudent.setBaseClassMergeId(baseClassMerge.getId());
+                    baseClassMergeBaseClassMergeStudentMapper.insert(baseClassMergeStudent);
+                }
+            }
+            //已经不存在的id 删除
+            if(baseClassMergeStudentRemoveIds.size() > 0){
+                baseClassMergeBaseClassMergeStudentMapper.deleteBatchIds(baseClassMergeStudentRemoveIds);
+            }
+        }
+        //********************************* BaseClassMergeStudent  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        baseClassMergeBaseClassMergeMapper.deleteBatchIds(ids);
+        baseClassMergeBaseClassMergeStudentMapper.delete(Wrappers.lambdaQuery(BaseClassMergeStudent.class).in(BaseClassMergeStudent::getBaseClassMergeId, ids));
+
+        return true;
+    }
+}

src/main/java/com/xjrsoft/module/base/vo/BaseClassMergePageVo.java

@@ -0,0 +1,74 @@
+package com.xjrsoft.module.base.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 班级合并分页列表出参
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+public class BaseClassMergePageVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人id
+    */
+    @ApiModelProperty("修改人id")
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    private Date modifyDate;
+    /**
+    * 删除标记(0:未删除 1:已删除)
+    */
+    @ApiModelProperty("删除标记(0:未删除 1:已删除)")
+    private Short deleteMark;
+    /**
+    * 有效标记(0:未启用 1:已启用)
+    */
+    @ApiModelProperty("有效标记(0:未启用 1:已启用)")
+    private Short enabledMark;
+    /**
+    * 涉及学生人数
+    */
+    @ApiModelProperty("涉及学生人数")
+    private Integer studentCount;
+    /**
+    * 目标班级
+    */
+    @ApiModelProperty("目标班级")
+    private Long targetClassId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+
+}

src/main/java/com/xjrsoft/module/base/vo/BaseClassMergeStudentVo.java

@@ -0,0 +1,44 @@
+package com.xjrsoft.module.base.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 dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+public class BaseClassMergeStudentVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    /**
+    * 班级合并id(base_class_merge)
+    */
+    @ApiModelProperty("班级合并id(base_class_merge)")
+    private Long baseClassMergeId;
+    /**
+    * 原有班级
+    */
+    @ApiModelProperty("原有班级")
+    private Long classId;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+
+
+
+}

src/main/java/com/xjrsoft/module/base/vo/BaseClassMergeVo.java

@@ -0,0 +1,50 @@
+package com.xjrsoft.module.base.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;
+import com.xjrsoft.module.base.entity.BaseClassMergeStudent;
+
+/**
+* @title: 班级合并表单出参
+* @Author dzx
+* @Date: 2025-04-08
+* @Version 1.0
+*/
+@Data
+public class BaseClassMergeVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    /**
+    * 涉及学生人数
+    */
+    @ApiModelProperty("涉及学生人数")
+    private Integer studentCount;
+    /**
+    * 目标班级
+    */
+    @ApiModelProperty("目标班级")
+    private Long targetClassId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+
+
+    /**
+    * baseClassMergeStudent
+    */
+    @ApiModelProperty("baseClassMergeStudent子表")
+    private List<BaseClassMergeStudentVo> baseClassMergeStudentList;
+
+}

src/main/resources/sqlScript/20250408_sql.sql

@@ -0,0 +1,62 @@
+-- ---------------------------------------------------------------
+-- 学生复读流程
+-- ---------------------------------------------------------------
+CREATE TABLE `wf_student_repeat_study` (
+  `id` BIGINT NOT NULL COMMENT '主键',
+  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME(3) DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人id',
+  `modify_date` DATETIME(3) DEFAULT NULL COMMENT '修改日期',
+  `delete_mark` SMALLINT DEFAULT NULL COMMENT '删除标记(0:未删除 1:已删除)',
+  `enabled_mark` SMALLINT DEFAULT NULL COMMENT '有效标记(0:未启用 1:已启用)',
+  `is_original` INT DEFAULT NULL COMMENT '是否本校生(1:是 0:否)',
+  `name` VARCHAR(50) DEFAULT NULL COMMENT '学生姓名',
+  `credential_number` VARCHAR(30) DEFAULT NULL COMMENT '身份证',
+  `old_grade_id` BIGINT DEFAULT NULL COMMENT '原年级id',
+  `old_class_id` BIGINT(30) DEFAULT NULL COMMENT '原班级id',
+  `archives_status` VARCHAR(20) DEFAULT NULL COMMENT '学籍状态',
+  `mobile` VARCHAR(20) DEFAULT NULL COMMENT '手机号',
+  `grade_id` BIGINT DEFAULT NULL COMMENT '年级id(base_grade)',
+  `major_set_id` BIGINT DEFAULT NULL COMMENT '专业方向id',
+  `class_id` BIGINT DEFAULT NULL COMMENT '教务处审批班级',
+  `stduy_status` VARCHAR(30) DEFAULT NULL COMMENT '就读方式',
+  `teacher_id` BIGINT DEFAULT NULL COMMENT '班主任id(xjr_user)',
+  `teacher_name` VARCHAR(20) DEFAULT NULL COMMENT '班主任姓名',
+  `remarks` VARCHAR(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生复读流程';
+
+
+-- ---------------------------------------------------------------
+-- 班级合并
+-- ---------------------------------------------------------------
+CREATE TABLE `base_class_merge` (
+  `id` BIGINT NOT NULL COMMENT '主键',
+  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME(3) DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人id',
+  `modify_date` DATETIME(3) DEFAULT NULL COMMENT '修改日期',
+  `delete_mark` SMALLINT DEFAULT NULL COMMENT '删除标记(0:未删除 1:已删除)',
+  `enabled_mark` SMALLINT DEFAULT NULL COMMENT '有效标记(0:未启用 1:已启用)',
+  `student_count` INT DEFAULT NULL COMMENT '涉及学生人数',
+  `target_class_id` BIGINT DEFAULT NULL COMMENT '目标班级',
+  `reason` VARCHAR(500) DEFAULT NULL COMMENT '原因',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='班级合并';
+
+-- ---------------------------------------------------------------
+-- 班级合并涉及学生
+-- ---------------------------------------------------------------
+CREATE TABLE `base_class_merge_student` (
+  `id` BIGINT NOT NULL COMMENT '主键',
+  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME(3) DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人id',
+  `modify_date` DATETIME(3) DEFAULT NULL COMMENT '修改日期',
+  `delete_mark` SMALLINT DEFAULT NULL COMMENT '删除标记(0:未删除 1:已删除)',
+  `enabled_mark` SMALLINT DEFAULT NULL COMMENT '有效标记(0:未启用 1:已启用)',
+  `base_class_merge_id` BIGINT DEFAULT NULL COMMENT '班级合并id(base_class_merge)',
+  `class_id` BIGINT DEFAULT NULL COMMENT '原有班级',
+  `user_id` BIGINT DEFAULT NULL COMMENT '学生id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='班级合并涉及学生';

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

@@ -4594,4 +4594,38 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcBaseClassMerge() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_class_merge");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("base_class_merge_student");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("base_class_merge_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("base");//包名
+        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);
+    }
 }