学籍异动列表查询和详情查询

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

@@ -6,6 +6,7 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -50,12 +51,7 @@ public class SchoolRollStudentController {
     @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);
+        Page<SchoolRollStudentPageVo> page = schoolRollStudentService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<SchoolRollStudentPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollStudentPageVo.class);
         return RT.ok(pageOutput);
     }
@@ -64,11 +60,11 @@ public class SchoolRollStudentController {
     @ApiOperation(value="根据id查询学籍异动学生信息")
     @SaCheckPermission("schoolrollstudent:detail")
     public RT<SchoolRollStudentVo> info(@RequestParam Long id){
-        SchoolRollStudent schoolRollStudent = schoolRollStudentService.getById(id);
+        SchoolRollStudentVo schoolRollStudent = schoolRollStudentService.getInfo(id);
         if (schoolRollStudent == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(schoolRollStudent, SchoolRollStudentVo.class));
+        return RT.ok(schoolRollStudent);
     }
 
 

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

@@ -22,5 +22,22 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 public class SchoolRollStudentPageDto extends PageInput {
 
+    @ApiModelProperty("异动类型id")
+    private Long schoolRollCategoryId;
+
+    @ApiModelProperty("异动原因id")
+    private Long schoolRollReasonId;
+
+    @ApiModelProperty("学生姓名")
+    private String name;
+
+    @ApiModelProperty("学号")
+    private String studentId;
+
+    @ApiModelProperty("证件号")
+    private String credentialNumber;
+
+    @ApiModelProperty("异动前班级")
+    private Long beforeClassName;
 
 }

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

@@ -1,8 +1,11 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.SchoolRollStudentPageDto;
 import com.xjrsoft.module.student.entity.SchoolRollStudent;
+import com.xjrsoft.module.student.vo.SchoolRollStudentPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollStudentVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface SchoolRollStudentMapper extends MPJBaseMapper<SchoolRollStudent> {
+    Page<SchoolRollStudentPageVo> getPage(Page<SchoolRollStudentPageVo> page, SchoolRollStudentPageDto dto);
 
+    SchoolRollStudentVo getInfo(Long id);
 }

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

@@ -1,7 +1,11 @@
 package com.xjrsoft.module.student.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.SchoolRollStudentPageDto;
 import com.xjrsoft.module.student.entity.SchoolRollStudent;
+import com.xjrsoft.module.student.vo.SchoolRollStudentPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollStudentVo;
 
 /**
 * @title: 学籍异动学生
@@ -13,4 +17,9 @@ import com.xjrsoft.module.student.entity.SchoolRollStudent;
 public interface ISchoolRollStudentService extends MPJBaseService<SchoolRollStudent> {
 
     Boolean dataHandle(Long dataId);
+
+    Page<SchoolRollStudentPageVo> getPage(Page<SchoolRollStudentPageVo> page, SchoolRollStudentPageDto dto);
+
+
+    SchoolRollStudentVo getInfo(Long id);
 }

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

@@ -2,15 +2,19 @@ package com.xjrsoft.module.student.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.SchoolChangeType;
+import com.xjrsoft.module.student.dto.SchoolRollStudentPageDto;
 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.student.vo.SchoolRollStudentPageVo;
+import com.xjrsoft.module.student.vo.SchoolRollStudentVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
 import lombok.AllArgsConstructor;
@@ -48,6 +52,18 @@ public class SchoolRollStudentServiceImpl extends MPJBaseServiceImpl<SchoolRollS
         return true;
     }
 
+    @Override
+    public Page<SchoolRollStudentPageVo> getPage(Page<SchoolRollStudentPageVo> page, SchoolRollStudentPageDto dto) {
+        Page<SchoolRollStudentPageVo> result = schoolRollStudentMapper.getPage(page, dto);
+        return result;
+    }
+
+    @Override
+    public SchoolRollStudentVo getInfo(Long id) {
+        return schoolRollStudentMapper.getInfo(id);
+    }
+
+
     /**
      * 休学:禁用学生账号
      */

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

@@ -0,0 +1,75 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学籍异动学生分页列表出参
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+@Data
+public class SchoolRollStudentPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生名字
+    */
+    @ApiModelProperty("学生名字")
+    private String name;
+    /**
+    * 证件号
+    */
+    @ApiModelProperty("证件号")
+    private String credentialNumber;
+    /**
+    * 学籍异动类型-中文
+    */
+    @ApiModelProperty("学籍异动类型-中文")
+    private String scholarshipSourceCn;
+
+    /**
+     * 学籍异动类型
+     */
+    @ApiModelProperty("学籍异动类型")
+    private String scholarshipSource;
+
+    /**
+    * 异动前班级
+    */
+    @ApiModelProperty("异动前班级")
+    private String beforeClassName;
+    /**
+    * 异动后班级
+    */
+    @ApiModelProperty("异动后班级")
+    private String backClassName;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 入班时间
+    */
+    @ApiModelProperty("入班时间")
+    private Date inClassDate;
+    /**
+    * 离班时间
+    */
+    @ApiModelProperty("离班时间")
+    private Date outClassDate;
+
+}

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

@@ -0,0 +1,91 @@
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学籍异动学生表单出参
+* @Author dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+@Data
+public class SchoolRollStudentVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("学号")
+    private String studentId;
+
+    @ApiModelProperty("性别")
+    private String gender;
+
+    @ApiModelProperty("证件号")
+    private String credentialNumber;
+
+    @ApiModelProperty("异动类型")
+    private String scholarshipSourceCn;
+
+    @ApiModelProperty("是否保留学籍")
+    private Integer isRetain;
+
+    @ApiModelProperty("申请人")
+    private String applicantUserName;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("申请时间")
+    private String createDate;
+
+    @ApiModelProperty("是否记录到档案")
+    private Integer isRecord;
+
+    @ApiModelProperty("休学年限")
+    private String leaveYear;
+
+
+    @ApiModelProperty("是否给予肄业")
+    private Integer isUnderGraduate;
+
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+    @ApiModelProperty("异动前行政班")
+    private String beforeClassName;
+
+    @ApiModelProperty("异动前年级")
+    private String beforeGradeName;
+
+    @ApiModelProperty("异动前专业方向")
+    private String beforeMajorSetName;
+
+    @ApiModelProperty("异动前组织机构")
+    private String beforeDepartmentName;
+
+    @ApiModelProperty("异动后行政班")
+    private String backClassName;
+
+    @ApiModelProperty("异动后年级")
+    private String backGradeName;
+
+    @ApiModelProperty("异动后专业方向")
+    private String backMajorSetName;
+
+    @ApiModelProperty("异动后组织机构")
+    private String backDepartmentName;
+
+    @ApiModelProperty("异动原因")
+    private String reason;
+
+    @ApiModelProperty("入班日期")
+    private String inClassDate;
+
+}

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

@@ -0,0 +1,324 @@
+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 dzx
+* @Date: 2023-11-30
+* @Version 1.0
+*/
+@Data
+public class SchoolRollTransferStudentPageVo {
+
+    /**
+    * 主键编号
+    */
+    @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;
+    /**
+    * 所属机构(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;
+
+}

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

@@ -0,0 +1,294 @@
+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-30
+* @Version 1.0
+*/
+@Data
+public class SchoolRollTransferStudentVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @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;
+
+
+
+}

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.SchoolRollStudentMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.student.dto.SchoolRollStudentPageDto" resultType="com.xjrsoft.module.student.vo.SchoolRollStudentPageVo">
+        select t.id,t.sort_code,t1.name,t1.credential_number,t3.name as scholarship_source_cn,
+        t4.name as before_class_name,t5.name AS back_class_name,t1.remark,t.in_class_date,t.out_class_date
+        ,t.scholarship_source from school_roll_student t
+        left join xjr_user t1 on t1.id = t.student_id
+        left join base_student t2 on t.student_id = t2.user_id
+        left join xjr_dictionary_detail t3 on t.scholarship_source = t3.code and t3.item_id = 1729751199857102849
+        left join base_class t4 on t.before_class_id = t4.id
+        LEFT JOIN base_class t5 ON t.back_class_id = t5.id
+        left join school_roll_category t6 on t.school_roll_category_id = t6.id
+        left join school_roll_reason t7 on t.school_roll_reason_id = t7.id
+        where t.delete_mark = 0 and t.status = 1
+    </select>
+    <select id="getInfo" resultType="com.xjrsoft.module.student.vo.SchoolRollStudentVo">
+        select t.id,t1.name,t2.student_id,t1.gender,t1.credential_number,t3.name as scholarship_source_cn
+        ,t.scholarship_source,t.is_retain,t8.name as applicant_user_name,t.create_date,t.is_record
+        ,t.leave_year,t.is_under_graduate,t.status
+        ,t4.name AS before_class_name,t9.name as before_grade_name,t10.name as before_major_set_name,
+        t11.name as before_department_name,
+        t5.name AS back_class_name,t12.name as back_grade_name,t13.name as back_major_set_name,
+        t14.name as back_department_name,t.reason,
+        t1.remark,t.in_class_date,t.out_class_date,t.status
+        from school_roll_student t
+        left join xjr_user t1 on t1.id = t.student_id
+        left join base_student t2 on t.student_id = t2.user_id
+        left join xjr_dictionary_detail t3 on t.scholarship_source = t3.code and t3.item_id = 1729751199857102849
+        left join base_class t4 on t.before_class_id = t4.id
+        LEFT JOIN base_class t5 ON t.back_class_id = t5.id
+        left join school_roll_category t6 on t.school_roll_category_id = t6.id
+        left join school_roll_reason t7 on t.school_roll_reason_id = t7.id
+        LEFT JOIN xjr_user t8 ON t8.id = t.applicant_user_id
+        left join base_grade t9 on t9.id = t.before_grade_id
+        left join base_major_set t10 on t10.id = t.before_major_set_id
+        left join xjr_department t11 on t11.id = t.before_department_id
+        LEFT JOIN base_grade t12 ON t12.id = t.back_grade_id
+        LEFT JOIN base_major_set t13 ON t13.id = t.back_major_set_id
+        LEFT JOIN xjr_department t14 ON t14.id = t.back_department_id
+        where t.delete_mark = 0 and t.status = 1
+        and t.id = #{id}
+    </select>
+</mapper>