1、增加学生职务维护

2、调整学生班级干部字段和校级干部字段

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

@@ -39,7 +39,7 @@ import java.util.List;
 /**
 * @title: 学生班级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @RestController

src/main/java/com/xjrsoft/module/student/controller/BaseStudentPostController.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.AddBaseStudentPostDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentPostDto;
+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.BaseStudentPostPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentPost;
+import com.xjrsoft.module.student.service.IBaseStudentPostService;
+import com.xjrsoft.module.student.vo.BaseStudentPostPageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentPostVo;
+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-13
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/basestudentpost")
+@Api(value = "/student"  + "/basestudentpost",tags = "学生职务设置代码")
+@AllArgsConstructor
+public class BaseStudentPostController {
+
+
+    private final IBaseStudentPostService baseStudentPostService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生职务设置列表(分页)")
+    @SaCheckPermission("basestudentpost:detail")
+    public RT<PageOutput<BaseStudentPostPageVo>> page(@Valid BaseStudentPostPageDto dto){
+
+        LambdaQueryWrapper<BaseStudentPost> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentPost::getId)
+                .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentPost> page = baseStudentPostService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentPostPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentPostPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生职务设置信息")
+    @SaCheckPermission("basestudentpost:detail")
+    public RT<BaseStudentPostVo> info(@RequestParam Long id){
+        BaseStudentPost baseStudentPost = baseStudentPostService.getById(id);
+        if (baseStudentPost == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentPost, BaseStudentPostVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生职务设置")
+    @SaCheckPermission("basestudentpost:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentPostDto dto){
+        BaseStudentPost baseStudentPost = BeanUtil.toBean(dto, BaseStudentPost.class);
+        boolean isSuccess = baseStudentPostService.save(baseStudentPost);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生职务设置")
+    @SaCheckPermission("basestudentpost:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentPostDto dto){
+
+        BaseStudentPost baseStudentPost = BeanUtil.toBean(dto, BaseStudentPost.class);
+        return RT.ok(baseStudentPostService.updateById(baseStudentPost));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生职务设置")
+    @SaCheckPermission("basestudentpost:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentPostService.removeBatchByIds(ids));
+
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid BaseStudentPostPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<BaseStudentPostPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<BaseStudentPostPageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, BaseStudentPostPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "BaseStudentPost" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

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

@@ -39,7 +39,7 @@ import java.util.List;
 /**
 * @title: 学生校级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @RestController

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

@@ -16,7 +16,7 @@ import java.util.Date;
 /**
 * @title: 学生班级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -50,15 +50,10 @@ public class AddBaseStudentClassCadreDto implements Serializable {
     @ApiModelProperty("联系电话")
     private String mobile;
     /**
-    * 职务
+    * 职务id
     */
-    @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 职务类型
-    */
-    @ApiModelProperty("职务类型")
-    private String postType;
+    @ApiModelProperty("职务id")
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -0,0 +1,58 @@
+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-13
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentPostDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务级别
+    */
+    @ApiModelProperty("职务级别")
+    private String level;
+    /**
+    * 是否允许德育检查(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
+    private Integer isAllowedCheck;
+    /**
+    * 职责描述
+    */
+    @ApiModelProperty("职责描述")
+    private String explains;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+
+}

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

@@ -16,7 +16,7 @@ import java.util.Date;
 /**
 * @title: 学生校级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -48,12 +48,7 @@ public class AddBaseStudentSchoolCadreDto implements Serializable {
     * 职务
     */
     @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 级别
-    */
-    @ApiModelProperty("级别")
-    private String level;
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -15,7 +15,7 @@ import java.util.Date;
 /**
 * @title: 学生班级干部管理分页查询入参
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data

src/main/java/com/xjrsoft/module/student/dto/BaseStudentPostPageDto.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-13
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentPostPageDto extends PageInput {
+
+
+}

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

@@ -15,7 +15,7 @@ import java.util.Date;
 /**
 * @title: 学生校级干部管理分页查询入参
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data

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

@@ -16,7 +16,7 @@ import java.util.Date;
 /**
 * @title: 学生班级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentPostDto.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-13
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentPostDto extends AddBaseStudentPostDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -16,7 +16,7 @@ import java.util.Date;
 /**
 * @title: 学生校级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data

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

@@ -20,7 +20,7 @@ import java.util.Date;
 /**
 * @title: 学生班级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -99,15 +99,10 @@ public class BaseStudentClassCadre implements Serializable {
     @ApiModelProperty("联系电话")
     private String mobile;
     /**
-    * 职务
+    * 职务id
     */
-    @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 职务类型
-    */
-    @ApiModelProperty("职务类型")
-    private String postType;
+    @ApiModelProperty("职务id")
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -0,0 +1,108 @@
+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-13
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_post")
+@ApiModel(value = "学生职务设置对象", description = "学生职务设置")
+public class BaseStudentPost 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 post;
+    /**
+    * 职务级别
+    */
+    @ApiModelProperty("职务级别")
+    private String level;
+    /**
+    * 是否允许德育检查(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
+    private Integer isAllowedCheck;
+    /**
+    * 职责描述
+    */
+    @ApiModelProperty("职责描述")
+    private String explains;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+
+
+}

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

@@ -20,7 +20,7 @@ import java.util.Date;
 /**
 * @title: 学生校级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -97,12 +97,7 @@ public class BaseStudentSchoolCadre implements Serializable {
     * 职务
     */
     @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 级别
-    */
-    @ApiModelProperty("级别")
-    private String level;
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
 * @title: 学生班级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Mapper

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentPostMapper.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.BaseStudentPost;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生职务设置
+* @Author dzx
+* @Date: 2023-11-13
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentPostMapper extends BaseMapper<BaseStudentPost> {
+
+}

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
 * @title: 学生校级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Mapper

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

@@ -9,7 +9,7 @@ import java.util.List;
 /**
 * @title: 学生班级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 

src/main/java/com/xjrsoft/module/student/service/IBaseStudentPostService.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.BaseStudentPost;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生职务设置
+* @Author dzx
+* @Date: 2023-11-13
+* @Version 1.0
+*/
+
+public interface IBaseStudentPostService extends IService<BaseStudentPost> {
+}

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

@@ -9,7 +9,7 @@ import java.util.List;
 /**
 * @title: 学生校级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 

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

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 /**
 * @title: 学生班级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Service

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentPostServiceImpl.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.BaseStudentPost;
+import com.xjrsoft.module.student.mapper.BaseStudentPostMapper;
+import com.xjrsoft.module.student.service.IBaseStudentPostService;
+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-13
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentPostServiceImpl extends ServiceImpl<BaseStudentPostMapper, BaseStudentPost> implements IBaseStudentPostService {
+}

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

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 /**
 * @title: 学生校级干部管理
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Service

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

@@ -17,7 +17,7 @@ import java.util.Date;
 /**
 * @title: 学生班级干部管理分页列表出参
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -108,19 +108,12 @@ public class BaseStudentClassCadrePageVo {
     @ApiModelProperty("联系电话")
     private String mobile;
     /**
-    * 职务
+    * 职务id
     */
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("职务")
-    @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 职务类型
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("职务类型")
-    @ApiModelProperty("职务类型")
-    private String postType;
+    @ExcelProperty("职务id")
+    @ApiModelProperty("职务id")
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
 * @title: 学生班级干部管理表单出参
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -49,15 +49,10 @@ public class BaseStudentClassCadreVo {
     @ApiModelProperty("联系电话")
     private String mobile;
     /**
-    * 职务
+    * 职务id
     */
-    @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 职务类型
-    */
-    @ApiModelProperty("职务类型")
-    private String postType;
+    @ApiModelProperty("职务id")
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -0,0 +1,118 @@
+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-13
+* @Version 1.0
+*/
+@Data
+public class BaseStudentPostPageVo {
+
+    /**
+    * 主键编号
+    */
+    @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 post;
+    /**
+    * 职务级别
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务级别")
+    @ApiModelProperty("职务级别")
+    private String level;
+    /**
+    * 是否允许德育检查(1:是 0:否)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否允许德育检查(1:是 0:否)")
+    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
+    private Integer isAllowedCheck;
+    /**
+    * 职责描述
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职责描述")
+    @ApiModelProperty("职责描述")
+    private String explains;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否启用(1:是 0:否)")
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+
+}

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

@@ -0,0 +1,59 @@
+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-13
+* @Version 1.0
+*/
+@Data
+public class BaseStudentPostVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务级别
+    */
+    @ApiModelProperty("职务级别")
+    private String level;
+    /**
+    * 是否允许德育检查(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
+    private Integer isAllowedCheck;
+    /**
+    * 职责描述
+    */
+    @ApiModelProperty("职责描述")
+    private String explains;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+
+
+
+}

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

@@ -17,7 +17,7 @@ import java.util.Date;
 /**
 * @title: 学生校级干部管理分页列表出参
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -106,14 +106,7 @@ public class BaseStudentSchoolCadrePageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("职务")
     @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 级别
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("级别")
-    @ApiModelProperty("级别")
-    private String level;
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
 * @title: 学生校级干部管理表单出参
 * @Author dzx
-* @Date: 2023-11-10
+* @Date: 2023-11-13
 * @Version 1.0
 */
 @Data
@@ -47,12 +47,7 @@ public class BaseStudentSchoolCadreVo {
     * 职务
     */
     @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 级别
-    */
-    @ApiModelProperty("级别")
-    private String level;
+    private Long postId;
     /**
     * 学生任职机构
     */

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

@@ -490,6 +490,38 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+
+    /**
+     * 学生职务设置
+     */
+    @Test
+    public void gcBaseStudentPost() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_post");//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);