Quellcode durchsuchen

学籍异动规则以及插班生规则处理

dzx vor 1 Jahr
Ursprung
Commit
f64f04076e
20 geänderte Dateien mit 1677 neuen und 25 gelöschten Zeilen
  1. 45 0
      src/main/java/com/xjrsoft/common/enums/SchoolChangeType.java
  2. 31 0
      src/main/java/com/xjrsoft/module/liteflow/node/WfSchoolRollStudentNode.java
  3. 31 0
      src/main/java/com/xjrsoft/module/liteflow/node/WfSchoolRollTransferStudentNode.java
  4. 102 0
      src/main/java/com/xjrsoft/module/student/controller/SchoolRollStudentController.java
  5. 102 0
      src/main/java/com/xjrsoft/module/student/controller/SchoolRollTransferStudentController.java
  6. 168 0
      src/main/java/com/xjrsoft/module/student/dto/AddSchoolRollStudentDto.java
  7. 293 0
      src/main/java/com/xjrsoft/module/student/dto/AddSchoolRollTransferStudentDto.java
  8. 26 0
      src/main/java/com/xjrsoft/module/student/dto/SchoolRollStudentPageDto.java
  9. 26 0
      src/main/java/com/xjrsoft/module/student/dto/SchoolRollTransferStudentPageDto.java
  10. 32 0
      src/main/java/com/xjrsoft/module/student/dto/UpdateSchoolRollStudentDto.java
  11. 32 0
      src/main/java/com/xjrsoft/module/student/dto/UpdateSchoolRollTransferStudentDto.java
  12. 218 0
      src/main/java/com/xjrsoft/module/student/entity/SchoolRollStudent.java
  13. 343 0
      src/main/java/com/xjrsoft/module/student/entity/SchoolRollTransferStudent.java
  14. 17 0
      src/main/java/com/xjrsoft/module/student/mapper/SchoolRollStudentMapper.java
  15. 17 0
      src/main/java/com/xjrsoft/module/student/mapper/SchoolRollTransferStudentMapper.java
  16. 16 0
      src/main/java/com/xjrsoft/module/student/service/ISchoolRollStudentService.java
  17. 16 0
      src/main/java/com/xjrsoft/module/student/service/ISchoolRollTransferStudentService.java
  18. 0 25
      src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollReasonServiceImpl.java.1701246165568.bak
  19. 105 0
      src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollStudentServiceImpl.java
  20. 57 0
      src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollTransferStudentServiceImpl.java

+ 45 - 0
src/main/java/com/xjrsoft/common/enums/SchoolChangeType.java

@@ -0,0 +1,45 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * @author dzx
+ * @date 2023/11/30
+ * 学生异动类型
+ */
+public enum SchoolChangeType {
+
+    /**
+     * 转专业(班级)
+     * */
+    ScClass("sc_class", "转专业(班级)"),
+
+    /**
+     * 休学
+     * */
+    ScOutSchool("sc_out_school", "休学"),
+
+    /**
+     * 退学
+     * */
+    ScOut("sc_out", "退学"),
+
+    /**
+     * 复学
+     * */
+    ScRecoverSchool("sc_recover_school", "复学");
+
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    SchoolChangeType(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

+ 31 - 0
src/main/java/com/xjrsoft/module/liteflow/node/WfSchoolRollStudentNode.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.student.service.ISchoolRollStudentService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author dzx
+ * @date 2023/11/30
+ */
+@Component("wf_school_roll_student_node")
+public class WfSchoolRollStudentNode extends NodeComponent {
+    private ISchoolRollStudentService schoolRollStudentService;
+
+    @Override
+    public void process() throws Exception {
+        // 获取表单中数据编号
+        Map<String, Object> params = this.getFirstContextBean();
+        Object value = util.getFormDatKey(params,"id");
+        Long formId = Convert.toLong(value);
+        if (formId != null) {
+            // 数据处理
+            schoolRollStudentService.dataHandle(formId);
+        }
+    }
+
+
+}

+ 31 - 0
src/main/java/com/xjrsoft/module/liteflow/node/WfSchoolRollTransferStudentNode.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.student.service.ISchoolRollTransferStudentService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author dzx
+ * @date 2023/11/30
+ */
+@Component("wf_school_roll_transfer_student_node")
+public class WfSchoolRollTransferStudentNode extends NodeComponent {
+    private ISchoolRollTransferStudentService schoolRollTransferStudentService;
+
+    @Override
+    public void process() throws Exception {
+        // 获取表单中数据编号
+        Map<String, Object> params = this.getFirstContextBean();
+        Object value = util.getFormDatKey(params,"id");
+        Long formId = Convert.toLong(value);
+        if (formId != null) {
+            // 数据处理
+            schoolRollTransferStudentService.dataCache(formId);
+        }
+    }
+
+
+}

+ 102 - 0
src/main/java/com/xjrsoft/module/student/controller/SchoolRollStudentController.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.AddSchoolRollStudentDto;
+import com.xjrsoft.module.student.dto.UpdateSchoolRollStudentDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.SchoolRollStudentPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollStudent;
+import com.xjrsoft.module.student.service.ISchoolRollStudentService;
+import com.xjrsoft.module.student.vo.SchoolRollStudentPageVo;
+
+import com.xjrsoft.module.student.vo.SchoolRollStudentVo;
+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-30
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/schoolRollStudent")
+@Api(value = "/student"  + "/schoolRollStudent",tags = "学籍异动学生代码")
+@AllArgsConstructor
+public class SchoolRollStudentController {
+
+
+    private final ISchoolRollStudentService schoolRollStudentService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学籍异动学生列表(分页)")
+    @SaCheckPermission("schoolrollstudent:detail")
+    public RT<PageOutput<SchoolRollStudentPageVo>> page(@Valid SchoolRollStudentPageDto dto){
+
+        LambdaQueryWrapper<SchoolRollStudent> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(SchoolRollStudent::getId)
+                .select(SchoolRollStudent.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollStudentPageVo.class).contains(x.getProperty()));
+        IPage<SchoolRollStudent> page = schoolRollStudentService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<SchoolRollStudentPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollStudentPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学籍异动学生信息")
+    @SaCheckPermission("schoolrollstudent:detail")
+    public RT<SchoolRollStudentVo> info(@RequestParam Long id){
+        SchoolRollStudent schoolRollStudent = schoolRollStudentService.getById(id);
+        if (schoolRollStudent == null) {
+           return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(schoolRollStudent, SchoolRollStudentVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学籍异动学生")
+    @SaCheckPermission("schoolrollstudent:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSchoolRollStudentDto dto){
+        SchoolRollStudent schoolRollStudent = BeanUtil.toBean(dto, SchoolRollStudent.class);
+        boolean isSuccess = schoolRollStudentService.save(schoolRollStudent);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学籍异动学生")
+    @SaCheckPermission("schoolrollstudent:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSchoolRollStudentDto dto){
+
+        SchoolRollStudent schoolRollStudent = BeanUtil.toBean(dto, SchoolRollStudent.class);
+        return RT.ok(schoolRollStudentService.updateById(schoolRollStudent));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学籍异动学生")
+    @SaCheckPermission("schoolrollstudent:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(schoolRollStudentService.removeBatchByIds(ids));
+
+    }
+
+}

+ 102 - 0
src/main/java/com/xjrsoft/module/student/controller/SchoolRollTransferStudentController.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.AddSchoolRollTransferStudentDto;
+import com.xjrsoft.module.student.dto.UpdateSchoolRollTransferStudentDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.SchoolRollTransferStudentPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollTransferStudent;
+import com.xjrsoft.module.student.service.ISchoolRollTransferStudentService;
+import com.xjrsoft.module.student.vo.SchoolRollTransferStudentPageVo;
+
+import com.xjrsoft.module.student.vo.SchoolRollTransferStudentVo;
+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-30
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/schoolRollTransferStudent")
+@Api(value = "/student"  + "/schoolRollTransferStudent",tags = "插班生管理代码")
+@AllArgsConstructor
+public class SchoolRollTransferStudentController {
+
+
+    private final ISchoolRollTransferStudentService schoolRollTransferStudentService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="插班生管理列表(分页)")
+    @SaCheckPermission("schoolrolltransferstudent:detail")
+    public RT<PageOutput<SchoolRollTransferStudentPageVo>> page(@Valid SchoolRollTransferStudentPageDto dto){
+
+        LambdaQueryWrapper<SchoolRollTransferStudent> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(SchoolRollTransferStudent::getId)
+                .select(SchoolRollTransferStudent.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollTransferStudentPageVo.class).contains(x.getProperty()));
+        IPage<SchoolRollTransferStudent> page = schoolRollTransferStudentService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<SchoolRollTransferStudentPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollTransferStudentPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询插班生管理信息")
+    @SaCheckPermission("schoolrolltransferstudent:detail")
+    public RT<SchoolRollTransferStudentVo> info(@RequestParam Long id){
+        SchoolRollTransferStudent schoolRollTransferStudent = schoolRollTransferStudentService.getById(id);
+        if (schoolRollTransferStudent == null) {
+           return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(schoolRollTransferStudent, SchoolRollTransferStudentVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增插班生管理")
+    @SaCheckPermission("schoolrolltransferstudent:add")
+    public RT<Boolean> add(@Valid @RequestBody AddSchoolRollTransferStudentDto dto){
+        SchoolRollTransferStudent schoolRollTransferStudent = BeanUtil.toBean(dto, SchoolRollTransferStudent.class);
+        boolean isSuccess = schoolRollTransferStudentService.save(schoolRollTransferStudent);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改插班生管理")
+    @SaCheckPermission("schoolrolltransferstudent:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateSchoolRollTransferStudentDto dto){
+
+        SchoolRollTransferStudent schoolRollTransferStudent = BeanUtil.toBean(dto, SchoolRollTransferStudent.class);
+        return RT.ok(schoolRollTransferStudentService.updateById(schoolRollTransferStudent));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除插班生管理")
+    @SaCheckPermission("schoolrolltransferstudent:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(schoolRollTransferStudentService.removeBatchByIds(ids));
+
+    }
+
+}

+ 168 - 0
src/main/java/com/xjrsoft/module/student/dto/AddSchoolRollStudentDto.java

@@ -0,0 +1,168 @@
+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-30
+* @Version 1.0
+*/
+@Data
+public class AddSchoolRollStudentDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 学籍异动类型(xjr_dictionary_item[school_change_type])
+    */
+    @ApiModelProperty("学籍异动类型(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSource;
+    /**
+    * 学籍异动类别ID(school_roll_category)
+    */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private Long schoolRollCategoryId;
+    /**
+    * 学籍异动原因ID(school_roll_reason)
+    */
+    @ApiModelProperty("学籍异动原因ID(school_roll_reason)")
+    private Long schoolRollReasonId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 异动前所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动前所属机构(xjr_department)")
+    private Long beforeDepartmentId;
+    /**
+    * 异动前入学年级(base_grade)
+    */
+    @ApiModelProperty("异动前入学年级(base_grade)")
+    private Long beforeGradeId;
+    /**
+    * 异动前班级(base_class)
+    */
+    @ApiModelProperty("异动前班级(base_class)")
+    private Long beforeClassId;
+    /**
+    * 异动前专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动前专业方向(base_major_set)")
+    private Long beforeMajorSetId;
+    /**
+    * 异动后所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动后所属机构(xjr_department)")
+    private Long backDepartmentId;
+    /**
+    * 异动后入学年级(base_grade)
+    */
+    @ApiModelProperty("异动后入学年级(base_grade)")
+    private Long backGradeId;
+    /**
+    * 异动后班级(base_class)
+    */
+    @ApiModelProperty("异动后班级(base_class)")
+    private Long backClassId;
+    /**
+    * 异动后专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动后专业方向(base_major_set)")
+    private Long backMajorSetId;
+    /**
+    * 学生编号(学生user_id)
+    */
+    @ApiModelProperty("学生编号(学生user_id)")
+    private Long studentId;
+    /**
+    * 是否保留学籍(0:否 1:是)
+    */
+    @ApiModelProperty("是否保留学籍(0:否 1:是)")
+    private Integer isRetain;
+    /**
+    * 是否记录到档案(0:否 1:是)
+    */
+    @ApiModelProperty("是否记录到档案(0:否 1:是)")
+    private Integer isRecord;
+    /**
+    * 是否注销账号(0:否 1:是)
+    */
+    @ApiModelProperty("是否注销账号(0:否 1:是)")
+    private Integer isCancelAccount;
+    /**
+    * 是否恢复账号(0:否 1:是)
+    */
+    @ApiModelProperty("是否恢复账号(0:否 1:是)")
+    private Integer isRecover;
+    /**
+    * 是否给予肄业(0:否 1:是)
+    */
+    @ApiModelProperty("是否给予肄业(0:否 1:是)")
+    private Integer isUnderGraduate;
+    /**
+    * 是否已经维护到国家/省学籍系统(0:未维护 1:已维护 2:无需维护)
+    */
+    @ApiModelProperty("是否已经维护到国家/省学籍系统(0:未维护 1:已维护 2:无需维护)")
+    private Integer isMaintained;
+    /**
+    * 入班时间
+    */
+    @ApiModelProperty("入班时间")
+    private Date inClassDate;
+    /**
+    * 离班时间
+    */
+    @ApiModelProperty("离班时间")
+    private Date outClassDate;
+    /**
+    * 休学年限 
+    */
+    @ApiModelProperty("休学年限 ")
+    private String leaveYear;
+    /**
+    * 休学时段(开始时间)
+    */
+    @ApiModelProperty("休学时段(开始时间)")
+    private Date leaveStartYear;
+    /**
+    * 休学时段(结束时间)
+    */
+    @ApiModelProperty("休学时段(结束时间)")
+    private Date leaveEndYear;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+}

+ 293 - 0
src/main/java/com/xjrsoft/module/student/dto/AddSchoolRollTransferStudentDto.java

@@ -0,0 +1,293 @@
+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-30
+* @Version 1.0
+*/
+@Data
+public class AddSchoolRollTransferStudentDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 入学年级(base_grade)
+    */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+    * 班级(base_class)
+    */
+    @ApiModelProperty("班级(base_class)")
+    private Long classId;
+    /**
+    * 专业方向(base_major_set)
+    */
+    @ApiModelProperty("专业方向(base_major_set)")
+    private Long majorSetId;
+    /**
+    * 入班时间
+    */
+    @ApiModelProperty("入班时间")
+    private Date inClassDate;
+    /**
+    * 转学前学校名称
+    */
+    @ApiModelProperty("转学前学校名称")
+    private String beforeSchoolName;
+    /**
+    * 转学前年级名称
+    */
+    @ApiModelProperty("转学前年级名称")
+    private String beforeGradeName;
+    /**
+    * 转学前班级名称
+    */
+    @ApiModelProperty("转学前班级名称")
+    private String beforeClassName;
+    /**
+    * 转学前专业方向名称
+    */
+    @ApiModelProperty("转学前专业方向名称")
+    private String beforeMajorSetName;
+    /**
+    * 转学前学号
+    */
+    @ApiModelProperty("转学前学号")
+    private String beforeSchoolId;
+    /**
+    * 转学日期
+    */
+    @ApiModelProperty("转学日期")
+    private Date transferDate;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 别名
+    */
+    @ApiModelProperty("别名")
+    private String asName;
+    /**
+    * 性别(xjr_dictionary_item[gender])
+    */
+    @ApiModelProperty("性别(xjr_dictionary_item[gender])")
+    private String gender;
+    /**
+    * 证件类型(xjr_dictionary_item[credential_type])
+    */
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+    /**
+    * 证件号码
+    */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
+    /**
+    * 出生日期
+    */
+    @ApiModelProperty("出生日期")
+    private Date dayOfBirth;
+    /**
+    * 生日类型(xjr_dictionary_item[date_type])
+    */
+    @ApiModelProperty("生日类型(xjr_dictionary_item[date_type])")
+    private String birthType;
+    /**
+    * 民族(xjr_dictionary_item[nation])
+    */
+    @ApiModelProperty("民族(xjr_dictionary_item[nation])")
+    private String nation;
+    /**
+    * 血型(xjr_dictionary_item[blood_type])
+    */
+    @ApiModelProperty("血型(xjr_dictionary_item[blood_type])")
+    private String bloodType;
+    /**
+    * 健康状况(xjr_dictionary_item[health])
+    */
+    @ApiModelProperty("健康状况(xjr_dictionary_item[health])")
+    private String health;
+    /**
+    * 婚姻状况(xjr_dictionary_item[marital_state])
+    */
+    @ApiModelProperty("婚姻状况(xjr_dictionary_item[marital_state])")
+    private String maritalState;
+    /**
+    * 政治面貌(xjr_dictionary_item[political_state])
+    */
+    @ApiModelProperty("政治面貌(xjr_dictionary_item[political_state])")
+    private String politicalState;
+    /**
+    * 信仰宗教(xjr_dictionary_item[religion])
+    */
+    @ApiModelProperty("信仰宗教(xjr_dictionary_item[religion])")
+    private String religion;
+    /**
+    * 国籍地区(xjr_dictionary_item[nationality])
+    */
+    @ApiModelProperty("国籍地区(xjr_dictionary_item[nationality])")
+    private String nationality;
+    /**
+    * 港澳台侨外(xjr_dictionary_item[chinese_type])
+    */
+    @ApiModelProperty("港澳台侨外(xjr_dictionary_item[chinese_type])")
+    private String chineseType;
+    /**
+    * 籍贯 省(xjr_area)
+    */
+    @ApiModelProperty("籍贯 省(xjr_area)")
+    private Long provinces;
+    /**
+    * 籍贯 市(xjr_area)
+    */
+    @ApiModelProperty("籍贯 市(xjr_area)")
+    private Long city;
+    /**
+    * 籍贯 区/县(xjr_area)
+    */
+    @ApiModelProperty("籍贯 区/县(xjr_area)")
+    private Long district;
+    /**
+    * 户口类别(xjr_dictionary_item[house_hold_type])
+    */
+    @ApiModelProperty("户口类别(xjr_dictionary_item[house_hold_type])")
+    private String houseHoldType;
+    /**
+    * 户口所在地 省(xjr_area)
+    */
+    @ApiModelProperty("户口所在地 省(xjr_area)")
+    private Long houseProvinces;
+    /**
+    * 户口所在地 市(xjr_area)
+    */
+    @ApiModelProperty("户口所在地 市(xjr_area)")
+    private Long houseCity;
+    /**
+    * 户口所在地 区/县(xjr_area)
+    */
+    @ApiModelProperty("户口所在地 区/县(xjr_area)")
+    private Long houseDistrict;
+    /**
+    * 户口所在详细地址
+    */
+    @ApiModelProperty("户口所在详细地址")
+    private String houseHoldAddress;
+    /**
+    * 所属派出所
+    */
+    @ApiModelProperty("所属派出所")
+    private String belongsPolice;
+    /**
+    * 出生地 省(xjr_area)
+    */
+    @ApiModelProperty("出生地 省(xjr_area)")
+    private Long birthProvinces;
+    /**
+    * 出生地 市(xjr_area)
+    */
+    @ApiModelProperty("出生地 市(xjr_area)")
+    private Long birthCity;
+    /**
+    * 出生地 区/县(xjr_area)
+    */
+    @ApiModelProperty("出生地 区/县(xjr_area)")
+    private Long birthDistrict;
+    /**
+    * 学生居住地类型(xjr_dictionary_item[residence_type])
+    */
+    @ApiModelProperty("学生居住地类型(xjr_dictionary_item[residence_type])")
+    private String residenceType;
+    /**
+    * 是否随迁子女
+    */
+    @ApiModelProperty("是否随迁子女")
+    private Short isMigrateChildren;
+    /**
+    * 是否流动人口
+    */
+    @ApiModelProperty("是否流动人口")
+    private Short isFloatingPopulation;
+    /**
+    * 家庭电话
+    */
+    @ApiModelProperty("家庭电话")
+    private String telephone;
+    /**
+    * 联系人姓名
+    */
+    @ApiModelProperty("联系人姓名")
+    private String contact;
+    /**
+    * 家庭住址
+    */
+    @ApiModelProperty("家庭住址")
+    private String address;
+    /**
+    * 微信号
+    */
+    @ApiModelProperty("微信号")
+    private String wechat;
+    /**
+    * 是否低保
+    */
+    @ApiModelProperty("是否低保")
+    private Short isIndemnify;
+    /**
+    * 是否享受国家助学金
+    */
+    @ApiModelProperty("是否享受国家助学金")
+    private Short isStipend;
+    /**
+    * 是否免学费
+    */
+    @ApiModelProperty("是否免学费")
+    private Short isFree;
+    /**
+    * 是否建档立卡
+    */
+    @ApiModelProperty("是否建档立卡")
+    private Short isFilingCard;
+    /**
+    * 是否住宿
+    */
+    @ApiModelProperty("是否住宿")
+    private Short isStay;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+}

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

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

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

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

+ 218 - 0
src/main/java/com/xjrsoft/module/student/entity/SchoolRollStudent.java

@@ -0,0 +1,218 @@
+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-30
+* @Version 1.0
+*/
+@Data
+@TableName("school_roll_student")
+@ApiModel(value = "school_roll_student", description = "学籍异动学生")
+public class SchoolRollStudent 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 Long applicantUserId;
+    /**
+    * 学籍异动类型(xjr_dictionary_item[school_change_type])
+    */
+    @ApiModelProperty("学籍异动类型(xjr_dictionary_item[school_change_type])")
+    private String scholarshipSource;
+    /**
+    * 学籍异动类别ID(school_roll_category)
+    */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private Long schoolRollCategoryId;
+    /**
+    * 学籍异动原因ID(school_roll_reason)
+    */
+    @ApiModelProperty("学籍异动原因ID(school_roll_reason)")
+    private Long schoolRollReasonId;
+    /**
+    * 原因
+    */
+    @ApiModelProperty("原因")
+    private String reason;
+    /**
+    * 异动前所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动前所属机构(xjr_department)")
+    private Long beforeDepartmentId;
+    /**
+    * 异动前入学年级(base_grade)
+    */
+    @ApiModelProperty("异动前入学年级(base_grade)")
+    private Long beforeGradeId;
+    /**
+    * 异动前班级(base_class)
+    */
+    @ApiModelProperty("异动前班级(base_class)")
+    private Long beforeClassId;
+    /**
+    * 异动前专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动前专业方向(base_major_set)")
+    private Long beforeMajorSetId;
+    /**
+    * 异动后所属机构(xjr_department)
+    */
+    @ApiModelProperty("异动后所属机构(xjr_department)")
+    private Long backDepartmentId;
+    /**
+    * 异动后入学年级(base_grade)
+    */
+    @ApiModelProperty("异动后入学年级(base_grade)")
+    private Long backGradeId;
+    /**
+    * 异动后班级(base_class)
+    */
+    @ApiModelProperty("异动后班级(base_class)")
+    private Long backClassId;
+    /**
+    * 异动后专业方向(base_major_set)
+    */
+    @ApiModelProperty("异动后专业方向(base_major_set)")
+    private Long backMajorSetId;
+    /**
+    * 学生编号(学生user_id)
+    */
+    @ApiModelProperty("学生编号(学生user_id)")
+    private Long studentId;
+    /**
+    * 是否保留学籍(0:否 1:是)
+    */
+    @ApiModelProperty("是否保留学籍(0:否 1:是)")
+    private Integer isRetain;
+    /**
+    * 是否记录到档案(0:否 1:是)
+    */
+    @ApiModelProperty("是否记录到档案(0:否 1:是)")
+    private Integer isRecord;
+    /**
+    * 是否注销账号(0:否 1:是)
+    */
+    @ApiModelProperty("是否注销账号(0:否 1:是)")
+    private Integer isCancelAccount;
+    /**
+    * 是否恢复账号(0:否 1:是)
+    */
+    @ApiModelProperty("是否恢复账号(0:否 1:是)")
+    private Integer isRecover;
+    /**
+    * 是否给予肄业(0:否 1:是)
+    */
+    @ApiModelProperty("是否给予肄业(0:否 1:是)")
+    private Integer isUnderGraduate;
+    /**
+    * 是否已经维护到国家/省学籍系统(0:未维护 1:已维护 2:无需维护)
+    */
+    @ApiModelProperty("是否已经维护到国家/省学籍系统(0:未维护 1:已维护 2:无需维护)")
+    private Integer isMaintained;
+    /**
+    * 入班时间
+    */
+    @ApiModelProperty("入班时间")
+    private Date inClassDate;
+    /**
+    * 离班时间
+    */
+    @ApiModelProperty("离班时间")
+    private Date outClassDate;
+    /**
+    * 休学年限 
+    */
+    @ApiModelProperty("休学年限 ")
+    private String leaveYear;
+    /**
+    * 休学时段(开始时间)
+    */
+    @ApiModelProperty("休学时段(开始时间)")
+    private Date leaveStartYear;
+    /**
+    * 休学时段(结束时间)
+    */
+    @ApiModelProperty("休学时段(结束时间)")
+    private Date leaveEndYear;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+
+}

+ 343 - 0
src/main/java/com/xjrsoft/module/student/entity/SchoolRollTransferStudent.java

@@ -0,0 +1,343 @@
+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-30
+* @Version 1.0
+*/
+@Data
+@TableName("school_roll_transfer_student")
+@ApiModel(value = "school_roll_transfer_student", description = "插班生管理")
+public class SchoolRollTransferStudent 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;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 入学年级(base_grade)
+    */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+    * 班级(base_class)
+    */
+    @ApiModelProperty("班级(base_class)")
+    private Long classId;
+    /**
+    * 专业方向(base_major_set)
+    */
+    @ApiModelProperty("专业方向(base_major_set)")
+    private Long majorSetId;
+    /**
+    * 入班时间
+    */
+    @ApiModelProperty("入班时间")
+    private Date inClassDate;
+    /**
+    * 转学前学校名称
+    */
+    @ApiModelProperty("转学前学校名称")
+    private String beforeSchoolName;
+    /**
+    * 转学前年级名称
+    */
+    @ApiModelProperty("转学前年级名称")
+    private String beforeGradeName;
+    /**
+    * 转学前班级名称
+    */
+    @ApiModelProperty("转学前班级名称")
+    private String beforeClassName;
+    /**
+    * 转学前专业方向名称
+    */
+    @ApiModelProperty("转学前专业方向名称")
+    private String beforeMajorSetName;
+    /**
+    * 转学前学号
+    */
+    @ApiModelProperty("转学前学号")
+    private String beforeSchoolId;
+    /**
+    * 转学日期
+    */
+    @ApiModelProperty("转学日期")
+    private Date transferDate;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 别名
+    */
+    @ApiModelProperty("别名")
+    private String asName;
+    /**
+    * 性别(xjr_dictionary_item[gender])
+    */
+    @ApiModelProperty("性别(xjr_dictionary_item[gender])")
+    private String gender;
+    /**
+    * 证件类型(xjr_dictionary_item[credential_type])
+    */
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+    /**
+    * 证件号码
+    */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
+    /**
+    * 出生日期
+    */
+    @ApiModelProperty("出生日期")
+    private Date dayOfBirth;
+    /**
+    * 生日类型(xjr_dictionary_item[date_type])
+    */
+    @ApiModelProperty("生日类型(xjr_dictionary_item[date_type])")
+    private String birthType;
+    /**
+    * 民族(xjr_dictionary_item[nation])
+    */
+    @ApiModelProperty("民族(xjr_dictionary_item[nation])")
+    private String nation;
+    /**
+    * 血型(xjr_dictionary_item[blood_type])
+    */
+    @ApiModelProperty("血型(xjr_dictionary_item[blood_type])")
+    private String bloodType;
+    /**
+    * 健康状况(xjr_dictionary_item[health])
+    */
+    @ApiModelProperty("健康状况(xjr_dictionary_item[health])")
+    private String health;
+    /**
+    * 婚姻状况(xjr_dictionary_item[marital_state])
+    */
+    @ApiModelProperty("婚姻状况(xjr_dictionary_item[marital_state])")
+    private String maritalState;
+    /**
+    * 政治面貌(xjr_dictionary_item[political_state])
+    */
+    @ApiModelProperty("政治面貌(xjr_dictionary_item[political_state])")
+    private String politicalState;
+    /**
+    * 信仰宗教(xjr_dictionary_item[religion])
+    */
+    @ApiModelProperty("信仰宗教(xjr_dictionary_item[religion])")
+    private String religion;
+    /**
+    * 国籍地区(xjr_dictionary_item[nationality])
+    */
+    @ApiModelProperty("国籍地区(xjr_dictionary_item[nationality])")
+    private String nationality;
+    /**
+    * 港澳台侨外(xjr_dictionary_item[chinese_type])
+    */
+    @ApiModelProperty("港澳台侨外(xjr_dictionary_item[chinese_type])")
+    private String chineseType;
+    /**
+    * 籍贯 省(xjr_area)
+    */
+    @ApiModelProperty("籍贯 省(xjr_area)")
+    private Long provinces;
+    /**
+    * 籍贯 市(xjr_area)
+    */
+    @ApiModelProperty("籍贯 市(xjr_area)")
+    private Long city;
+    /**
+    * 籍贯 区/县(xjr_area)
+    */
+    @ApiModelProperty("籍贯 区/县(xjr_area)")
+    private Long district;
+    /**
+    * 户口类别(xjr_dictionary_item[house_hold_type])
+    */
+    @ApiModelProperty("户口类别(xjr_dictionary_item[house_hold_type])")
+    private String houseHoldType;
+    /**
+    * 户口所在地 省(xjr_area)
+    */
+    @ApiModelProperty("户口所在地 省(xjr_area)")
+    private Long houseProvinces;
+    /**
+    * 户口所在地 市(xjr_area)
+    */
+    @ApiModelProperty("户口所在地 市(xjr_area)")
+    private Long houseCity;
+    /**
+    * 户口所在地 区/县(xjr_area)
+    */
+    @ApiModelProperty("户口所在地 区/县(xjr_area)")
+    private Long houseDistrict;
+    /**
+    * 户口所在详细地址
+    */
+    @ApiModelProperty("户口所在详细地址")
+    private String houseHoldAddress;
+    /**
+    * 所属派出所
+    */
+    @ApiModelProperty("所属派出所")
+    private String belongsPolice;
+    /**
+    * 出生地 省(xjr_area)
+    */
+    @ApiModelProperty("出生地 省(xjr_area)")
+    private Long birthProvinces;
+    /**
+    * 出生地 市(xjr_area)
+    */
+    @ApiModelProperty("出生地 市(xjr_area)")
+    private Long birthCity;
+    /**
+    * 出生地 区/县(xjr_area)
+    */
+    @ApiModelProperty("出生地 区/县(xjr_area)")
+    private Long birthDistrict;
+    /**
+    * 学生居住地类型(xjr_dictionary_item[residence_type])
+    */
+    @ApiModelProperty("学生居住地类型(xjr_dictionary_item[residence_type])")
+    private String residenceType;
+    /**
+    * 是否随迁子女
+    */
+    @ApiModelProperty("是否随迁子女")
+    private Short isMigrateChildren;
+    /**
+    * 是否流动人口
+    */
+    @ApiModelProperty("是否流动人口")
+    private Short isFloatingPopulation;
+    /**
+    * 家庭电话
+    */
+    @ApiModelProperty("家庭电话")
+    private String telephone;
+    /**
+    * 联系人姓名
+    */
+    @ApiModelProperty("联系人姓名")
+    private String contact;
+    /**
+    * 家庭住址
+    */
+    @ApiModelProperty("家庭住址")
+    private String address;
+    /**
+    * 微信号
+    */
+    @ApiModelProperty("微信号")
+    private String wechat;
+    /**
+    * 是否低保
+    */
+    @ApiModelProperty("是否低保")
+    private Short isIndemnify;
+    /**
+    * 是否享受国家助学金
+    */
+    @ApiModelProperty("是否享受国家助学金")
+    private Short isStipend;
+    /**
+    * 是否免学费
+    */
+    @ApiModelProperty("是否免学费")
+    private Short isFree;
+    /**
+    * 是否建档立卡
+    */
+    @ApiModelProperty("是否建档立卡")
+    private Short isFilingCard;
+    /**
+    * 是否住宿
+    */
+    @ApiModelProperty("是否住宿")
+    private Short isStay;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/student/mapper/SchoolRollStudentMapper.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.SchoolRollStudent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学籍异动学生
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+@Mapper
+public interface SchoolRollStudentMapper extends MPJBaseMapper<SchoolRollStudent> {
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/student/mapper/SchoolRollTransferStudentMapper.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.SchoolRollTransferStudent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 插班生管理
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+@Mapper
+public interface SchoolRollTransferStudentMapper extends MPJBaseMapper<SchoolRollTransferStudent> {
+
+}

+ 16 - 0
src/main/java/com/xjrsoft/module/student/service/ISchoolRollStudentService.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.SchoolRollStudent;
+
+/**
+* @title: 学籍异动学生
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+
+public interface ISchoolRollStudentService extends MPJBaseService<SchoolRollStudent> {
+
+    Boolean dataHandle(Long dataId);
+}

+ 16 - 0
src/main/java/com/xjrsoft/module/student/service/ISchoolRollTransferStudentService.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.SchoolRollTransferStudent;
+
+/**
+* @title: 插班生管理
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+
+public interface ISchoolRollTransferStudentService extends MPJBaseService<SchoolRollTransferStudent> {
+
+    Boolean dataCache(Long dataId);
+}

+ 0 - 25
src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollReasonServiceImpl.java.1701246165568.bak

@@ -1,25 +0,0 @@
-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 {
-}

+ 105 - 0
src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollStudentServiceImpl.java

@@ -0,0 +1,105 @@
+package com.xjrsoft.module.student.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.enums.EnabledMark;
+import com.xjrsoft.common.enums.SchoolChangeType;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.entity.SchoolRollStudent;
+import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
+import com.xjrsoft.module.student.mapper.SchoolRollStudentMapper;
+import com.xjrsoft.module.student.service.ISchoolRollStudentService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 学籍异动学生
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SchoolRollStudentServiceImpl extends MPJBaseServiceImpl<SchoolRollStudentMapper, SchoolRollStudent> implements ISchoolRollStudentService {
+    private final SchoolRollStudentMapper schoolRollStudentMapper;
+    private final XjrUserMapper xjrUserMapper;
+    private final BaseStudentSchoolRollMapper baseStudentSchoolRollMapper;
+
+
+    @Override
+    public Boolean dataHandle(Long dataId) {
+        SchoolRollStudent schoolRollStudent = schoolRollStudentMapper.selectOne(
+            Wrappers.lambdaQuery(SchoolRollStudent.class).eq(SchoolRollStudent::getId, dataId)
+        );
+        String scholarshipSource = schoolRollStudent.getScholarshipSource();
+        if(SchoolChangeType.ScOutSchool.getCode().equals(scholarshipSource)){
+            scOutSchool(schoolRollStudent);
+        }else if(SchoolChangeType.ScOut.getCode().equals(scholarshipSource)){
+            scOut(schoolRollStudent);
+        }else if(SchoolChangeType.ScRecoverSchool.getCode().equals(scholarshipSource)){
+            scRecoverSchool(schoolRollStudent);
+        }else if(SchoolChangeType.ScClass.getCode().equals(scholarshipSource)){
+            scClass(schoolRollStudent);
+        }
+        return true;
+    }
+
+    /**
+     * 休学:禁用学生账号
+     */
+    void scOutSchool(SchoolRollStudent schoolRollStudent){
+        if(ObjectUtil.isNull(schoolRollStudent.getIsCancelAccount()) || schoolRollStudent.getIsCancelAccount() != 1){
+            return;
+        }
+        XjrUser xjrUser = xjrUserMapper.selectOne(Wrappers.lambdaQuery(XjrUser.class).eq(XjrUser::getId, schoolRollStudent.getStudentId()));
+        xjrUser.setEnabledMark(EnabledMark.DISABLED.getCode());
+        xjrUserMapper.updateById(xjrUser);
+    }
+
+    /**
+     * 退学:禁用学生账号
+     */
+    void scOut(SchoolRollStudent schoolRollStudent){
+        if(ObjectUtil.isNull(schoolRollStudent.getIsCancelAccount()) || schoolRollStudent.getIsCancelAccount() != 1){
+            return;
+        }
+        XjrUser xjrUser = xjrUserMapper.selectOne(Wrappers.lambdaQuery(XjrUser.class).eq(XjrUser::getId, schoolRollStudent.getStudentId()));
+        xjrUser.setEnabledMark(EnabledMark.DISABLED.getCode());
+        xjrUserMapper.updateById(xjrUser);
+    }
+
+    /**
+     * 复学:恢复学生账号并修改班级
+     */
+    void scRecoverSchool(SchoolRollStudent schoolRollStudent){
+        //启用学生账号
+        XjrUser xjrUser = xjrUserMapper.selectOne(Wrappers.lambdaQuery(XjrUser.class).eq(XjrUser::getId, schoolRollStudent.getStudentId()));
+        xjrUser.setEnabledMark(EnabledMark.ENABLED.getCode());
+        xjrUserMapper.updateById(xjrUser);
+
+        //修改学生的年级和班级
+        BaseStudentSchoolRoll baseStudentSchoolRoll = baseStudentSchoolRollMapper.selectOne(
+            Wrappers.lambdaQuery(BaseStudentSchoolRoll.class).eq(BaseStudentSchoolRoll::getUserId, schoolRollStudent.getStudentId())
+        );
+        baseStudentSchoolRoll.setClassId(schoolRollStudent.getBackClassId());
+        baseStudentSchoolRoll.setGradeId(schoolRollStudent.getBackGradeId());
+        baseStudentSchoolRollMapper.updateById(baseStudentSchoolRoll);
+    }
+
+    /**
+     * 转专业(班级):修改班级id
+     */
+    void scClass(SchoolRollStudent schoolRollStudent){
+        //修改学生的年级和班级
+        BaseStudentSchoolRoll baseStudentSchoolRoll = baseStudentSchoolRollMapper.selectOne(
+            Wrappers.lambdaQuery(BaseStudentSchoolRoll.class).eq(BaseStudentSchoolRoll::getUserId, schoolRollStudent.getStudentId())
+        );
+        baseStudentSchoolRoll.setClassId(schoolRollStudent.getBackClassId());
+        baseStudentSchoolRoll.setGradeId(schoolRollStudent.getBackGradeId());
+        baseStudentSchoolRollMapper.updateById(baseStudentSchoolRoll);
+    }
+
+}

+ 57 - 0
src/main/java/com/xjrsoft/module/student/service/impl/SchoolRollTransferStudentServiceImpl.java

@@ -0,0 +1,57 @@
+package com.xjrsoft.module.student.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudent;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.entity.SchoolRollTransferStudent;
+import com.xjrsoft.module.student.mapper.BaseStudentMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
+import com.xjrsoft.module.student.mapper.SchoolRollTransferStudentMapper;
+import com.xjrsoft.module.student.service.ISchoolRollTransferStudentService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 插班生管理
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class SchoolRollTransferStudentServiceImpl extends MPJBaseServiceImpl<SchoolRollTransferStudentMapper, SchoolRollTransferStudent> implements ISchoolRollTransferStudentService {
+    private final XjrUserMapper xjrUserMapper;
+    private final BaseStudentSchoolRollMapper baseStudentSchoolRollMapper;
+    private final BaseStudentMapper baseStudentMapper;
+    private final SchoolRollTransferStudentMapper schoolRollTransferStudentMapper;
+
+    /**
+     * 1、添加到xjr_user表中
+     * 2、添加到base_student_school_roll表中
+     * 3、添加到base_student表中
+     */
+    @Override
+    public Boolean dataCache(Long dataId) {
+        SchoolRollTransferStudent rollTransferStudent = schoolRollTransferStudentMapper.selectOne(
+            Wrappers.lambdaQuery(SchoolRollTransferStudent.class).eq(SchoolRollTransferStudent::getId, dataId)
+        );
+        XjrUser xjrUser = BeanUtil.toBean(rollTransferStudent, XjrUser.class);
+        int userCount = xjrUserMapper.insert(xjrUser);
+
+        if(userCount > 0){
+            BaseStudentSchoolRoll schoolRoll = BeanUtil.toBean(rollTransferStudent, BaseStudentSchoolRoll.class);
+            schoolRoll.setUserId(xjrUser.getId());
+            baseStudentSchoolRollMapper.insert(schoolRoll);
+
+            BaseStudent student = BeanUtil.toBean(rollTransferStudent, BaseStudent.class);
+            student.setUserId(xjrUser.getId());
+            baseStudentMapper.insert(student);
+        }
+
+        return true;
+    }
+}