/student/basestudentpost/list 学生职务设置列表(不分页) 传给前端的id主键应该是string类型的

/student/baseStudentBehaviorManage/page 学生操行分记录管理列表(pc端) 操行类别被删除,该类别的操行记录不在列表返回
/student/schoolRollCategory 新建接口

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

@@ -34,7 +34,7 @@ import java.util.List;
 /**
 * @title: 助学金申请学生信息
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @RestController

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

@@ -70,6 +70,7 @@ public class BaseStudentPostController {
 
         LambdaQueryWrapper<BaseStudentPost> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
+                .select(BaseStudentPost::getId)
                 .eq(ObjectUtil.isNotNull(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
                 .eq(BaseStudentPost::getStatus,0)
                 .orderByDesc(BaseStudentPost::getId)
@@ -88,10 +89,11 @@ public class BaseStudentPostController {
         IPage<BaseStudentPostPageVo> page = baseStudentPostService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPostPageVo.class,
                 MPJWrappers.<BaseStudentPost>lambdaJoin()
                         .orderByAsc(BaseStudentPost::getSortCode)
-                        .selectAs(BaseStudentPost::getId, BaseStudentPostPageVo::getId)
+
                 .selectAs(DictionaryDetail::getName, BaseStudentPostPageVo::getLevelCn)
                 .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostPageVo.class).contains(x.getProperty()))
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentPost::getLevel)
+                        .select(BaseStudentPost::getId)
         );
         PageOutput<BaseStudentPostPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentPostPageVo.class);
         return RT.ok(pageOutput);

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

@@ -0,0 +1,129 @@
+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.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+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.AddSchoolRollCategoryDto;
+import com.xjrsoft.module.student.dto.UpdateSchoolRollCategoryDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.SchoolRollCategoryPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentPost;
+import com.xjrsoft.module.student.entity.BaseStudentScholarshipCategory;
+import com.xjrsoft.module.student.entity.SchoolRollCategory;
+import com.xjrsoft.module.student.service.ISchoolRollCategoryService;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipCategoryPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollCategoryPageVo;
+
+import com.xjrsoft.module.student.vo.SchoolRollCategoryVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.system.entity.DictionaryItem;
+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 szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/schoolRollCategory")
+@Api(value = "/student"  + "/schoolRollCategory",tags = "学籍异动类别代码")
+@AllArgsConstructor
+public class SchoolRollCategoryController {
+
+
+    private final ISchoolRollCategoryService schoolRollCategoryService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="学籍异动类别列表(不分页)")
+    @SaCheckPermission("schoolrollcategory:detail")
+    public RT<List<SchoolRollCategoryVo>> list(@Valid SchoolRollCategoryPageDto dto){
+        MPJLambdaWrapper<SchoolRollCategory> queryWrapper= new MPJLambdaWrapper<>();
+        List<SchoolRollCategoryVo> list = schoolRollCategoryService.selectJoinList(SchoolRollCategoryVo.class,
+                queryWrapper.select(SchoolRollCategory::getId)
+                        .select(BaseStudentScholarshipCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentScholarshipCategoryPageVo.class).contains(x.getProperty()))
+//                        .leftJoin(DictionaryItem.class,DictionaryItem::getCode,"")
+//                        .leftJoin(DictionaryDetail.class, DictionaryDetail::getItemId, DictionaryItem::getId)
+        );
+//        MPJWrappers<SchoolRollCategory> queryWrapper = MPJWrappers.<SchoolRollCategory>lambdaJoin();
+//        queryWrapper
+//                .orderByDesc(SchoolRollCategory::getId)
+//                .select(SchoolRollCategory.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollCategoryPageVo.class).contains(x.getProperty()));
+//        IPage<SchoolRollCategory> page = schoolRollCategoryService.page(ConventPage.getPage(dto), queryWrapper);
+//        PageOutput<SchoolRollCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollCategoryPageVo.class);
+        return RT.ok(list);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学籍异动类别列表(分页)")
+    @SaCheckPermission("schoolrollcategory:detail")
+    public RT<PageOutput<SchoolRollCategoryPageVo>> page(@Valid SchoolRollCategoryPageDto dto){
+
+        LambdaQueryWrapper<SchoolRollCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(SchoolRollCategory::getId)
+                .select(SchoolRollCategory.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollCategoryPageVo.class).contains(x.getProperty()));
+        IPage<SchoolRollCategory> page = schoolRollCategoryService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<SchoolRollCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollCategoryPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学籍异动类别信息")
+    @SaCheckPermission("schoolrollcategory:detail")
+    public RT<SchoolRollCategoryVo> info(@RequestParam Long id){
+        SchoolRollCategory schoolRollCategory = schoolRollCategoryService.getById(id);
+        if (schoolRollCategory == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(schoolRollCategory, SchoolRollCategoryVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学籍异动类别")
+    @SaCheckPermission("schoolrollcategory:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSchoolRollCategoryDto dto){
+        SchoolRollCategory schoolRollCategory = BeanUtil.toBean(dto, SchoolRollCategory.class);
+        boolean isSuccess = schoolRollCategoryService.save(schoolRollCategory);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学籍异动类别")
+    @SaCheckPermission("schoolrollcategory:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSchoolRollCategoryDto dto){
+
+        SchoolRollCategory schoolRollCategory = BeanUtil.toBean(dto, SchoolRollCategory.class);
+        return RT.ok(schoolRollCategoryService.updateById(schoolRollCategory));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学籍异动类别")
+    @SaCheckPermission("schoolrollcategory:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(schoolRollCategoryService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,102 @@
+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.AddSchoolRollReasonDto;
+import com.xjrsoft.module.student.dto.UpdateSchoolRollReasonDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.SchoolRollReasonPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollReason;
+import com.xjrsoft.module.student.service.ISchoolRollReasonService;
+import com.xjrsoft.module.student.vo.SchoolRollReasonPageVo;
+
+import com.xjrsoft.module.student.vo.SchoolRollReasonVo;
+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 szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/schoolRollReason")
+@Api(value = "/student"  + "/schoolRollReason",tags = "学籍异动原因代码")
+@AllArgsConstructor
+public class SchoolRollReasonController {
+
+
+    private final ISchoolRollReasonService schoolRollReasonService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学籍异动原因列表(分页)")
+    @SaCheckPermission("schoolrollreason:detail")
+    public RT<PageOutput<SchoolRollReasonPageVo>> page(@Valid SchoolRollReasonPageDto dto){
+
+        LambdaQueryWrapper<SchoolRollReason> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(SchoolRollReason::getId)
+                .select(SchoolRollReason.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollReasonPageVo.class).contains(x.getProperty()));
+        IPage<SchoolRollReason> page = schoolRollReasonService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<SchoolRollReasonPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollReasonPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学籍异动原因信息")
+    @SaCheckPermission("schoolrollreason:detail")
+    public RT<SchoolRollReasonVo> info(@RequestParam Long id){
+        SchoolRollReason schoolRollReason = schoolRollReasonService.getById(id);
+        if (schoolRollReason == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(schoolRollReason, SchoolRollReasonVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学籍异动原因")
+    @SaCheckPermission("schoolrollreason:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSchoolRollReasonDto dto){
+        SchoolRollReason schoolRollReason = BeanUtil.toBean(dto, SchoolRollReason.class);
+        boolean isSuccess = schoolRollReasonService.save(schoolRollReason);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学籍异动原因")
+    @SaCheckPermission("schoolrollreason:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSchoolRollReasonDto dto){
+
+        SchoolRollReason schoolRollReason = BeanUtil.toBean(dto, SchoolRollReason.class);
+        return RT.ok(schoolRollReasonService.updateById(schoolRollReason));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学籍异动原因")
+    @SaCheckPermission("schoolrollreason:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(schoolRollReasonService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -16,7 +16,7 @@ import java.util.Date;
 /**
 * @title: 助学金申请学生信息
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Data

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

@@ -0,0 +1,48 @@
+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 phoenix
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+public class AddSchoolRollCategoryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 学籍异动类型(xjr_dictionary_item[school_change_type])
+    */
+    @ApiModelProperty("学籍异动类型(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSource;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,48 @@
+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 szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+public class AddSchoolRollReasonDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 学籍异动类别ID(school_roll_category)
+    */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private Long schoolRollCategoryId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -15,7 +15,7 @@ import java.util.Date;
 /**
 * @title: 助学金申请学生信息分页查询入参
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Data

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

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

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

@@ -16,7 +16,7 @@ import java.util.Date;
 /**
 * @title: 助学金申请学生信息
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Data

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

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

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

@@ -20,7 +20,7 @@ import java.util.Date;
 /**
 * @title: 助学金申请学生信息
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Data

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

@@ -0,0 +1,98 @@
+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 phoenix
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+@TableName("school_roll_category")
+@ApiModel(value = "school_roll_category", description = "学籍异动类别")
+public class SchoolRollCategory 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 name;
+    /**
+    * 学籍异动类型(xjr_dictionary_item[school_change_type])
+    */
+    @ApiModelProperty("学籍异动类型(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSource;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

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

@@ -0,0 +1,98 @@
+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 szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+@TableName("school_roll_reason")
+@ApiModel(value = "school_roll_reason", description = "学籍异动原因")
+public class SchoolRollReason 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 reason;
+    /**
+    * 学籍异动类别ID(school_roll_category)
+    */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private Long schoolRollCategoryId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
 * @title: 助学金申请学生信息
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Mapper

src/main/java/com/xjrsoft/module/student/mapper/SchoolRollCategoryMapper.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.SchoolRollCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学籍异动类别
+* @Author phoenix
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Mapper
+public interface SchoolRollCategoryMapper extends MPJBaseMapper<SchoolRollCategory> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/SchoolRollReasonMapper.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.SchoolRollReason;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学籍异动原因
+* @Author szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Mapper
+public interface SchoolRollReasonMapper extends MPJBaseMapper<SchoolRollReason> {
+
+}

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

@@ -9,7 +9,7 @@ import java.util.List;
 /**
 * @title: 助学金申请学生信息
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 

src/main/java/com/xjrsoft/module/student/service/ISchoolRollCategoryService.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.SchoolRollCategory;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学籍异动类别
+* @Author phoenix
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+
+public interface ISchoolRollCategoryService extends MPJBaseService<SchoolRollCategory> {
+}

src/main/java/com/xjrsoft/module/student/service/ISchoolRollReasonService.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.SchoolRollReason;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学籍异动原因
+* @Author szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+
+public interface ISchoolRollReasonService extends MPJBaseService<SchoolRollReason> {
+}

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

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 /**
 * @title: 助学金申请学生信息
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Service

src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollCategoryServiceImpl.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.SchoolRollCategory;
+import com.xjrsoft.module.student.mapper.SchoolRollCategoryMapper;
+import com.xjrsoft.module.student.service.ISchoolRollCategoryService;
+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 phoenix
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SchoolRollCategoryServiceImpl extends MPJBaseServiceImpl<SchoolRollCategoryMapper, SchoolRollCategory> implements ISchoolRollCategoryService {
+}

src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollReasonServiceImpl.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.SchoolRollReason;
+import com.xjrsoft.module.student.mapper.SchoolRollReasonMapper;
+import com.xjrsoft.module.student.service.ISchoolRollReasonService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学籍异动原因
+* @Author szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SchoolRollReasonServiceImpl extends MPJBaseServiceImpl<SchoolRollReasonMapper, SchoolRollReason> implements ISchoolRollReasonService {
+}

src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollReasonServiceImpl.java.1701246165568.bak

@@ -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.SchoolRollReason;
+import com.xjrsoft.module.student.mapper.SchoolRollReasonMapper;
+import com.xjrsoft.module.student.service.ISchoolRollReasonService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学籍异动原因
+* @Author szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SchoolRollReasonServiceImpl extends MPJBaseServiceImpl<SchoolRollReasonMapper, SchoolRollReason> implements ISchoolRollReasonService {
+}

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

@@ -24,7 +24,7 @@ public class BaseStudentBehaviorProjectPageVo {
     * 主键编号
     */
     @ApiModelProperty("主键编号")
-    private Long id;
+    private String id;
     /**
     * 创建人
     */

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

@@ -14,7 +14,7 @@ import java.util.Date;
 /**
 * @title: 助学金申请学生信息分页列表出参
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Data

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
 * @title: 助学金申请学生信息表单出参
 * @Author devil
-* @Date: 2023-11-28
+* @Date: 2023-11-29
 * @Version 1.0
 */
 @Data

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

@@ -29,7 +29,7 @@ public class BaseStudentPostListVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("主键编号")
     @ApiModelProperty("主键编号")
-    private Long id;
+    private String id;
     /**
     * 序号
     */

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

@@ -0,0 +1,65 @@
+package com.xjrsoft.module.student.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 szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+public class SchoolRollCategoryPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 学籍异动类型(xjr_dictionary_item[school_change_type])
+    */
+    @ApiModelProperty("学籍异动类型(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSource;
+    /**
+     * 学籍异动类型中文名(xjr_dictionary_item[school_change_type])
+     */
+    @ApiModelProperty("学籍异动类型中文名(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSourceCN;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,52 @@
+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 phoenix
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+public class SchoolRollCategoryVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 学籍异动类型(xjr_dictionary_item[school_change_type])
+    */
+    @ApiModelProperty("学籍异动类型(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSource;
+    /**
+     * 学籍异动类型中文名(xjr_dictionary_item[school_change_type])
+     */
+    @ApiModelProperty("学籍异动类型中文名(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSourceCN;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,79 @@
+package com.xjrsoft.module.student.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 szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+public class SchoolRollReasonPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 学籍异动类别ID(school_roll_category)
+    */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private Long schoolRollCategoryId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,49 @@
+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 szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+public class SchoolRollReasonVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 学籍异动类别ID(school_roll_category)
+    */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private Long schoolRollCategoryId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

src/main/resources/mapper/student/BaseStudentBehaviorManageMapper.xml

@@ -21,7 +21,7 @@
         LEFT JOIN base_student_behavior_project t2 ON t2.id = t.base_student_behavior_project_id
         LEFT JOIN base_semester t3 ON t3.id = t.base_semester_id
         LEFT JOIN base_grade t4 ON t.grade_id = t4.id
-        WHERE t.delete_mark = 0 AND t1.delete_mark = 0 AND t2.delete_mark = 0 AND (t.status = 1)
+        WHERE t.delete_mark = 0 AND t1.delete_mark = 0 AND t2.delete_mark = 0 AND t.status = 1 AND t1.delete_mark = 0
 
         <if test="dto.gradeId != null">
             and t.grade_id = #{dto.gradeId}
@@ -76,7 +76,7 @@
         LEFT JOIN base_student_behavior_category t3 ON t3.id = t.base_student_behavior_category_id
         LEFT JOIN base_student_behavior_project t4 ON t4.id = t.base_student_behavior_project_id
         LEFT JOIN base_student_school_roll t5 ON t1.user_id = t5.user_id
-        WHERE t.status = 1 AND t.delete_mark = 0
+        WHERE t.status = 1 AND t.delete_mark = 0 AND t3.delete_mark = 0
         AND t5.class_id IN (
         SELECT id FROM base_class WHERE teacher_id = #{dto.teacherId}
         )

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

@@ -822,6 +822,68 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    /**
+     * 学籍异动类别
+     * @throws IOException
+     */
+    @Test
+    public void gcSchoolRollCategory() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("school_roll_category");//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("phoenix");//作者名称
+        params.setPackageName("student");//包名
+        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);
+    }
+
+    /**
+     * 学籍异动类别
+     * @throws IOException
+     */
+    @Test
+    public void gcSchoolRollReason() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("school_roll_reason");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("student");//包名
+        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);