提交学生校级干木管理和学生班级干部管理

src/main/java/com/xjrsoft/module/student/controller/BaseStudentClassCadreController.java

@@ -0,0 +1,116 @@
+package com.xjrsoft.module.student.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.student.dto.AddBaseStudentClassCadreDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentClassCadreDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.http.ResponseEntity;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+
+import com.xjrsoft.module.student.dto.BaseStudentClassCadrePageDto;
+import com.xjrsoft.module.student.entity.BaseStudentClassCadre;
+import com.xjrsoft.module.student.service.IBaseStudentClassCadreService;
+import com.xjrsoft.module.student.vo.BaseStudentClassCadrePageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentClassCadreVo;
+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: 2023-11-10
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/basestudentclasscadre")
+@Api(value = "/student"  + "/basestudentclasscadre",tags = "学生班级干部管理代码")
+@AllArgsConstructor
+public class BaseStudentClassCadreController {
+
+
+    private final IBaseStudentClassCadreService baseStudentClassCadreService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生班级干部管理列表(分页)")
+    @SaCheckPermission("basestudentclasscadre:detail")
+    public RT<PageOutput<BaseStudentClassCadrePageVo>> page(@Valid BaseStudentClassCadrePageDto dto){
+
+        LambdaQueryWrapper<BaseStudentClassCadre> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentClassCadre::getId)
+                .select(BaseStudentClassCadre.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentClassCadrePageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentClassCadre> page = baseStudentClassCadreService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentClassCadrePageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentClassCadrePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生班级干部管理信息")
+    @SaCheckPermission("basestudentclasscadre:detail")
+    public RT<BaseStudentClassCadreVo> info(@RequestParam Long id){
+        BaseStudentClassCadre baseStudentClassCadre = baseStudentClassCadreService.getById(id);
+        if (baseStudentClassCadre == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentClassCadre, BaseStudentClassCadreVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生班级干部管理")
+    @SaCheckPermission("basestudentclasscadre:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentClassCadreDto dto){
+        BaseStudentClassCadre baseStudentClassCadre = BeanUtil.toBean(dto, BaseStudentClassCadre.class);
+        boolean isSuccess = baseStudentClassCadreService.save(baseStudentClassCadre);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生班级干部管理")
+    @SaCheckPermission("basestudentclasscadre:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentClassCadreDto dto){
+
+        BaseStudentClassCadre baseStudentClassCadre = BeanUtil.toBean(dto, BaseStudentClassCadre.class);
+        return RT.ok(baseStudentClassCadreService.updateById(baseStudentClassCadre));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生班级干部管理")
+    @SaCheckPermission("basestudentclasscadre:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentClassCadreService.removeBatchByIds(ids));
+
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid BaseStudentClassCadrePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<BaseStudentClassCadrePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<BaseStudentClassCadrePageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, BaseStudentClassCadrePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "BaseStudentClassCadre" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

src/main/java/com/xjrsoft/module/student/controller/BaseStudentSchoolCadreController.java

@@ -0,0 +1,116 @@
+package com.xjrsoft.module.student.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.student.dto.AddBaseStudentSchoolCadreDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentSchoolCadreDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.http.ResponseEntity;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+
+import com.xjrsoft.module.student.dto.BaseStudentSchoolCadrePageDto;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolCadre;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolCadreService;
+import com.xjrsoft.module.student.vo.BaseStudentSchoolCadrePageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentSchoolCadreVo;
+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: 2023-11-10
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/basestudentschoolcadre")
+@Api(value = "/student"  + "/basestudentschoolcadre",tags = "学生校级干部管理代码")
+@AllArgsConstructor
+public class BaseStudentSchoolCadreController {
+
+
+    private final IBaseStudentSchoolCadreService baseStudentSchoolCadreService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生校级干部管理列表(分页)")
+    @SaCheckPermission("basestudentschoolcadre:detail")
+    public RT<PageOutput<BaseStudentSchoolCadrePageVo>> page(@Valid BaseStudentSchoolCadrePageDto dto){
+
+        LambdaQueryWrapper<BaseStudentSchoolCadre> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentSchoolCadre::getId)
+                .select(BaseStudentSchoolCadre.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentSchoolCadrePageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentSchoolCadre> page = baseStudentSchoolCadreService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentSchoolCadrePageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentSchoolCadrePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生校级干部管理信息")
+    @SaCheckPermission("basestudentschoolcadre:detail")
+    public RT<BaseStudentSchoolCadreVo> info(@RequestParam Long id){
+        BaseStudentSchoolCadre baseStudentSchoolCadre = baseStudentSchoolCadreService.getById(id);
+        if (baseStudentSchoolCadre == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentSchoolCadre, BaseStudentSchoolCadreVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生校级干部管理")
+    @SaCheckPermission("basestudentschoolcadre:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentSchoolCadreDto dto){
+        BaseStudentSchoolCadre baseStudentSchoolCadre = BeanUtil.toBean(dto, BaseStudentSchoolCadre.class);
+        boolean isSuccess = baseStudentSchoolCadreService.save(baseStudentSchoolCadre);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生校级干部管理")
+    @SaCheckPermission("basestudentschoolcadre:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentSchoolCadreDto dto){
+
+        BaseStudentSchoolCadre baseStudentSchoolCadre = BeanUtil.toBean(dto, BaseStudentSchoolCadre.class);
+        return RT.ok(baseStudentSchoolCadreService.updateById(baseStudentSchoolCadre));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生校级干部管理")
+    @SaCheckPermission("basestudentschoolcadre:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentSchoolCadreService.removeBatchByIds(ids));
+
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid BaseStudentSchoolCadrePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<BaseStudentSchoolCadrePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<BaseStudentSchoolCadrePageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, BaseStudentSchoolCadrePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "BaseStudentSchoolCadre" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentSchoolCadreDto.java

@@ -0,0 +1,83 @@
+package com.xjrsoft.module.student.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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentSchoolCadreDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String userNumber;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Integer userId;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Integer classId;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 级别
+    */
+    @ApiModelProperty("级别")
+    private String level;
+    /**
+    * 学生任职机构
+    */
+    @ApiModelProperty("学生任职机构")
+    private Integer orgId;
+    /**
+    * 任职开始时间
+    */
+    @ApiModelProperty("任职开始时间")
+    private Date startTime;
+    /**
+    * 任职结束时间
+    */
+    @ApiModelProperty("任职结束时间")
+    private Date endTime;
+    /**
+    * 状态（1:在职 0:离职）
+    */
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+    /**
+    * 离职原因
+    */
+    @ApiModelProperty("离职原因")
+    private String leaveReason;
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentClassCadrePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentClassCadrePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentSchoolCadrePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentSchoolCadrePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentClassCadreDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.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 dzx
+* @Date: 2023-11-10
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentClassCadreDto extends AddBaseStudentClassCadreDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentSchoolCadreDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.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 dzx
+* @Date: 2023-11-10
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentSchoolCadreDto extends AddBaseStudentSchoolCadreDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/entity/BaseStudentClassCadre.java

@@ -0,0 +1,143 @@
+package com.xjrsoft.module.student.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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_class_cadre")
+@ApiModel(value = "学生班级干部管理对象", description = "学生班级干部管理")
+public class BaseStudentClassCadre 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 userNumber;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Integer userId;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Integer classId;
+    /**
+    * 联系电话
+    */
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务类型
+    */
+    @ApiModelProperty("职务类型")
+    private String postType;
+    /**
+    * 学生任职机构
+    */
+    @ApiModelProperty("学生任职机构")
+    private Integer orgId;
+    /**
+    * 任职开始时间
+    */
+    @ApiModelProperty("任职开始时间")
+    private Date startTime;
+    /**
+    * 任职结束时间
+    */
+    @ApiModelProperty("任职结束时间")
+    private Date endTime;
+    /**
+    * 状态（1:在职 0:离职）
+    */
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+    /**
+    * 离职生效日期
+    */
+    @ApiModelProperty("离职生效日期")
+    private Date leaveTime;
+    /**
+    * 离职原因
+    */
+    @ApiModelProperty("离职原因")
+    private String leaveReason;
+
+
+}

src/main/java/com/xjrsoft/module/student/entity/BaseStudentSchoolCadre.java

@@ -0,0 +1,133 @@
+package com.xjrsoft.module.student.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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_school_cadre")
+@ApiModel(value = "学生校级干部管理对象", description = "学生校级干部管理")
+public class BaseStudentSchoolCadre 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 userNumber;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Integer userId;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Integer classId;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 级别
+    */
+    @ApiModelProperty("级别")
+    private String level;
+    /**
+    * 学生任职机构
+    */
+    @ApiModelProperty("学生任职机构")
+    private Integer orgId;
+    /**
+    * 任职开始时间
+    */
+    @ApiModelProperty("任职开始时间")
+    private Date startTime;
+    /**
+    * 任职结束时间
+    */
+    @ApiModelProperty("任职结束时间")
+    private Date endTime;
+    /**
+    * 状态（1:在职 0:离职）
+    */
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+    /**
+    * 离职原因
+    */
+    @ApiModelProperty("离职原因")
+    private String leaveReason;
+
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentClassCadreMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentClassCadre;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生班级干部管理
+* @Author dzx
+* @Date: 2023-11-10
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentClassCadreMapper extends BaseMapper<BaseStudentClassCadre> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentSchoolCadreMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolCadre;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生校级干部管理
+* @Author dzx
+* @Date: 2023-11-10
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentSchoolCadreMapper extends BaseMapper<BaseStudentSchoolCadre> {
+
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentClassCadreService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentClassCadre;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生班级干部管理
+* @Author dzx
+* @Date: 2023-11-10
+* @Version 1.0
+*/
+
+public interface IBaseStudentClassCadreService extends IService<BaseStudentClassCadre> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentSchoolCadreService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolCadre;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生校级干部管理
+* @Author dzx
+* @Date: 2023-11-10
+* @Version 1.0
+*/
+
+public interface IBaseStudentSchoolCadreService extends IService<BaseStudentSchoolCadre> {
+}

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentClassCadreServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentClassCadre;
+import com.xjrsoft.module.student.mapper.BaseStudentClassCadreMapper;
+import com.xjrsoft.module.student.service.IBaseStudentClassCadreService;
+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: 2023-11-10
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentClassCadreServiceImpl extends ServiceImpl<BaseStudentClassCadreMapper, BaseStudentClassCadre> implements IBaseStudentClassCadreService {
+}

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentSchoolCadreServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolCadre;
+import com.xjrsoft.module.student.mapper.BaseStudentSchoolCadreMapper;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolCadreService;
+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: 2023-11-10
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentSchoolCadreServiceImpl extends ServiceImpl<BaseStudentSchoolCadreMapper, BaseStudentSchoolCadre> implements IBaseStudentSchoolCadreService {
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentClassCadrePageVo.java

@@ -0,0 +1,167 @@
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+public class BaseStudentClassCadrePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学号")
+    @ApiModelProperty("学号")
+    private String userNumber;
+    /**
+    * 学生id
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生id")
+    @ApiModelProperty("学生id")
+    private Integer userId;
+    /**
+    * 班级id
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("班级id")
+    @ApiModelProperty("班级id")
+    private Integer classId;
+    /**
+    * 联系电话
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("联系电话")
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    /**
+    * 职务
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务")
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务类型
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务类型")
+    @ApiModelProperty("职务类型")
+    private String postType;
+    /**
+    * 学生任职机构
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生任职机构")
+    @ApiModelProperty("学生任职机构")
+    private Integer orgId;
+    /**
+    * 任职开始时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("任职开始时间")
+    @ApiModelProperty("任职开始时间")
+    private Date startTime;
+    /**
+    * 任职结束时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("任职结束时间")
+    @ApiModelProperty("任职结束时间")
+    private Date endTime;
+    /**
+    * 状态（1:在职 0:离职）
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("状态（1:在职 0:离职）")
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+    /**
+    * 离职生效日期
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("离职生效日期")
+    @ApiModelProperty("离职生效日期")
+    private Date leaveTime;
+    /**
+    * 离职原因
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("离职原因")
+    @ApiModelProperty("离职原因")
+    private String leaveReason;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentClassCadreVo.java

@@ -0,0 +1,94 @@
+package com.xjrsoft.module.student.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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+public class BaseStudentClassCadreVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String userNumber;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Integer userId;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Integer classId;
+    /**
+    * 联系电话
+    */
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务类型
+    */
+    @ApiModelProperty("职务类型")
+    private String postType;
+    /**
+    * 学生任职机构
+    */
+    @ApiModelProperty("学生任职机构")
+    private Integer orgId;
+    /**
+    * 任职开始时间
+    */
+    @ApiModelProperty("任职开始时间")
+    private Date startTime;
+    /**
+    * 任职结束时间
+    */
+    @ApiModelProperty("任职结束时间")
+    private Date endTime;
+    /**
+    * 状态（1:在职 0:离职）
+    */
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+    /**
+    * 离职生效日期
+    */
+    @ApiModelProperty("离职生效日期")
+    private Date leaveTime;
+    /**
+    * 离职原因
+    */
+    @ApiModelProperty("离职原因")
+    private String leaveReason;
+
+
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentSchoolCadrePageVo.java

@@ -0,0 +1,153 @@
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+public class BaseStudentSchoolCadrePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学号")
+    @ApiModelProperty("学号")
+    private String userNumber;
+    /**
+    * 学生id
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生id")
+    @ApiModelProperty("学生id")
+    private Integer userId;
+    /**
+    * 班级id
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("班级id")
+    @ApiModelProperty("班级id")
+    private Integer classId;
+    /**
+    * 职务
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务")
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 级别
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("级别")
+    @ApiModelProperty("级别")
+    private String level;
+    /**
+    * 学生任职机构
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生任职机构")
+    @ApiModelProperty("学生任职机构")
+    private Integer orgId;
+    /**
+    * 任职开始时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("任职开始时间")
+    @ApiModelProperty("任职开始时间")
+    private Date startTime;
+    /**
+    * 任职结束时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("任职结束时间")
+    @ApiModelProperty("任职结束时间")
+    private Date endTime;
+    /**
+    * 状态（1:在职 0:离职）
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("状态（1:在职 0:离职）")
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+    /**
+    * 离职原因
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("离职原因")
+    @ApiModelProperty("离职原因")
+    private String leaveReason;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentSchoolCadreVo.java

@@ -0,0 +1,84 @@
+package com.xjrsoft.module.student.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: 2023-11-10
+* @Version 1.0
+*/
+@Data
+public class BaseStudentSchoolCadreVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String userNumber;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Integer userId;
+    /**
+    * 班级id
+    */
+    @ApiModelProperty("班级id")
+    private Integer classId;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 级别
+    */
+    @ApiModelProperty("级别")
+    private String level;
+    /**
+    * 学生任职机构
+    */
+    @ApiModelProperty("学生任职机构")
+    private Integer orgId;
+    /**
+    * 任职开始时间
+    */
+    @ApiModelProperty("任职开始时间")
+    private Date startTime;
+    /**
+    * 任职结束时间
+    */
+    @ApiModelProperty("任职结束时间")
+    private Date endTime;
+    /**
+    * 状态（1:在职 0:离职）
+    */
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+    /**
+    * 离职原因
+    */
+    @ApiModelProperty("离职原因")
+    private String leaveReason;
+
+
+
+}

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

@@ -1,8 +1,8 @@
 -- ----------------------------
--- 学生干部管理
+-- 学生校级干部管理
 -- ----------------------------
-DROP TABLE IF EXISTS base_student_cadre;
-CREATE TABLE base_student_cadre
+DROP TABLE IF EXISTS base_student_school_cadre;
+CREATE TABLE base_student_school_cadre
 (
     id BIGINT NOT NULL COMMENT '主键编号',
     `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
@@ -15,11 +15,41 @@ CREATE TABLE base_student_cadre
     `user_number` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
     `user_id` INT NULL DEFAULT NULL COMMENT '学生id',
     `class_id` INT NULL DEFAULT NULL COMMENT '班级id',
-    `post` INT NULL DEFAULT NULL COMMENT '职务',
-    `level` INT NULL DEFAULT NULL COMMENT '级别',
+    `post` VARCHAR(50) NULL DEFAULT NULL COMMENT '职务',
+    `level` VARCHAR(50) NULL DEFAULT NULL COMMENT '级别',
     `org_id` INT NULL DEFAULT NULL COMMENT '学生任职机构',
     `start_time` DATE NULL DEFAULT NULL COMMENT '任职开始时间',
     `end_time` DATE NULL DEFAULT NULL COMMENT '任职结束时间',
     `status` INT NOT NULL COMMENT '状态（1:在职 0:离职）',
+    `leave_reason` VARCHAR(500) NULL DEFAULT NULL COMMENT '离职原因',
     PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生干部管理';
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生校级干部管理';
+
+-- ----------------------------
+-- 学生班级干部管理
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_class_cadre;
+CREATE TABLE base_student_class_cadre
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `user_number` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
+    `user_id` INT NULL DEFAULT NULL COMMENT '学生id',
+    `class_id` INT NULL DEFAULT NULL COMMENT '班级id',
+    `mobile` VARCHAR(30) NULL DEFAULT NULL COMMENT '联系电话',
+    `post` VARCHAR(50) NULL DEFAULT NULL COMMENT '职务',
+    `post_type` VARCHAR(50) NULL DEFAULT NULL COMMENT '职务类型',
+    `org_id` INT NULL DEFAULT NULL COMMENT '学生任职机构',
+    `start_time` DATE NULL DEFAULT NULL COMMENT '任职开始时间',
+    `end_time` DATE NULL DEFAULT NULL COMMENT '任职结束时间',
+    `status` INT NOT NULL COMMENT '状态（1:在职 0:离职）',
+    `leave_time` DATE NULL DEFAULT NULL COMMENT '离职生效日期',
+    `leave_reason` VARCHAR(500) NULL DEFAULT NULL COMMENT '离职原因',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级干部管理';

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

@@ -401,11 +401,46 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 学生校级干部管理
+     */
     @Test
-    public void gcBaseStudentCadre() throws IOException {
+    public void gcBaseStudentSchoolCadre() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
-        mainTable.setTableName("base_student_cadre");//init_sql中的表名
+        mainTable.setTableName("base_student_school_cadre");//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("dzx");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(true);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+
+    /**
+     * 学生班级干部管理
+     */
+    @Test
+    public void gcBaseStudentClassCadre() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_class_cadre");//init_sql中的表名
         mainTable.setIsMain(true);//是否是主表，一般默认为true
         mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
         mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型