添加修改 助学金申请 接口

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

@@ -2,17 +2,24 @@ package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.student.dto.AddBaseStudentBursariesApplicantDto;
 import com.xjrsoft.module.student.dto.BaseStudentBursariesApplicantPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentBursariesApplicantDto;
 import com.xjrsoft.module.student.entity.BaseStudentBursariesApplicant;
+import com.xjrsoft.module.student.entity.BaseStudentBursariesStudent;
+import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.service.IBaseStudentBursariesApplicantService;
 import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantVo;
+import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -46,8 +53,18 @@ public class BaseStudentBursariesApplicantController {
     @GetMapping(value = "/page")
     @ApiOperation(value="助学金申请列表(分页)")
     @SaCheckPermission("basestudentbursariesapplicant:detail")
-    public RT<PageOutput<BaseStudentBursariesApplicantPageVo>> page(@Valid BaseStudentBursariesApplicantPageDto dto){
-        Page<BaseStudentBursariesApplicantPageVo> page = baseStudentBursariesApplicantService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+    public RT<PageOutput<BaseStudentBursariesApplicantPageVo>> page(@Valid BaseStudentBursariesApplicantPageDto dto) {
+
+        IPage<BaseStudentBursariesApplicantPageVo> page = baseStudentBursariesApplicantService.selectJoinListPage(
+                ConventPage.getPage(dto), BaseStudentBursariesApplicantPageVo.class,
+                MPJWrappers.<BaseStudentBursariesApplicant>lambdaJoin()
+                        .eq(BaseStudentBursariesApplicant::getBaseStudentBursariesProjectId, dto.getProjectId())
+                        .select(BaseStudentBursariesStudent::getId)
+                        .select(BaseStudentBursariesApplicant.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesApplicantPageVo.class).contains(x.getProperty()))
+                        .leftJoin(BaseStudentBursariesStudent.class,BaseStudentBursariesStudent::getBaseStudentBursariesApplicantId,BaseStudentBursariesApplicant::getId)
+                        .select(BaseStudentBursariesStudent.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesApplicantPageVo.class).contains(x.getProperty()))
+//                        .selectAs(BaseStudentBursariesStudent::getGradeName, BaseStudentBursariesApplicantPageVo::getGradeName)
+        );
         PageOutput<BaseStudentBursariesApplicantPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBursariesApplicantPageVo.class);
         return RT.ok(pageOutput);
     }

src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesProjectController.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.AddBaseStudentBursariesProjectDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentBursariesProjectDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentBursariesProjectPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBursariesProject;
+import com.xjrsoft.module.student.service.IBaseStudentBursariesProjectService;
+import com.xjrsoft.module.student.vo.BaseStudentBursariesProjectPageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentBursariesProjectVo;
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseStudentBursariesProject")
+@Api(value = "/student"  + "/baseStudentBursariesProject",tags = "助学金项目代码")
+@AllArgsConstructor
+public class BaseStudentBursariesProjectController {
+
+
+    private final IBaseStudentBursariesProjectService baseStudentBursariesProjectService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="助学金项目列表(分页)")
+    @SaCheckPermission("basestudentbursariesproject:detail")
+    public RT<PageOutput<BaseStudentBursariesProjectPageVo>> page(@Valid BaseStudentBursariesProjectPageDto dto){
+
+        LambdaQueryWrapper<BaseStudentBursariesProject> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentBursariesProject::getId)
+                .select(BaseStudentBursariesProject.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesProjectPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentBursariesProject> page = baseStudentBursariesProjectService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentBursariesProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBursariesProjectPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询助学金项目信息")
+    @SaCheckPermission("basestudentbursariesproject:detail")
+    public RT<BaseStudentBursariesProjectVo> info(@RequestParam Long id){
+        BaseStudentBursariesProject baseStudentBursariesProject = baseStudentBursariesProjectService.getById(id);
+        if (baseStudentBursariesProject == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentBursariesProject, BaseStudentBursariesProjectVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增助学金项目")
+    @SaCheckPermission("basestudentbursariesproject:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBursariesProjectDto dto){
+        BaseStudentBursariesProject baseStudentBursariesProject = BeanUtil.toBean(dto, BaseStudentBursariesProject.class);
+        boolean isSuccess = baseStudentBursariesProjectService.save(baseStudentBursariesProject);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改助学金项目")
+    @SaCheckPermission("basestudentbursariesproject:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBursariesProjectDto dto){
+
+        BaseStudentBursariesProject baseStudentBursariesProject = BeanUtil.toBean(dto, BaseStudentBursariesProject.class);
+        return RT.ok(baseStudentBursariesProjectService.updateById(baseStudentBursariesProject));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除助学金项目")
+    @SaCheckPermission("basestudentbursariesproject:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentBursariesProjectService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesStudentController.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.AddBaseStudentBursariesStudentDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentBursariesStudentDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentBursariesStudentPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBursariesStudent;
+import com.xjrsoft.module.student.service.IBaseStudentBursariesStudentService;
+import com.xjrsoft.module.student.vo.BaseStudentBursariesStudentPageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentBursariesStudentVo;
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseStudentBursariesStudent")
+@Api(value = "/student"  + "/baseStudentBursariesStudent",tags = "助学金申请学生信息代码")
+@AllArgsConstructor
+public class BaseStudentBursariesStudentController {
+
+
+    private final IBaseStudentBursariesStudentService baseStudentBursariesStudentService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="助学金申请学生信息列表(分页)")
+    @SaCheckPermission("basestudentbursariesstudent:detail")
+    public RT<PageOutput<BaseStudentBursariesStudentPageVo>> page(@Valid BaseStudentBursariesStudentPageDto dto){
+
+        LambdaQueryWrapper<BaseStudentBursariesStudent> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentBursariesStudent::getId)
+                .select(BaseStudentBursariesStudent.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesStudentPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentBursariesStudent> page = baseStudentBursariesStudentService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentBursariesStudentPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBursariesStudentPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询助学金申请学生信息信息")
+    @SaCheckPermission("basestudentbursariesstudent:detail")
+    public RT<BaseStudentBursariesStudentVo> info(@RequestParam Long id){
+        BaseStudentBursariesStudent baseStudentBursariesStudent = baseStudentBursariesStudentService.getById(id);
+        if (baseStudentBursariesStudent == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentBursariesStudent, BaseStudentBursariesStudentVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增助学金申请学生信息")
+    @SaCheckPermission("basestudentbursariesstudent:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBursariesStudentDto dto){
+        BaseStudentBursariesStudent baseStudentBursariesStudent = BeanUtil.toBean(dto, BaseStudentBursariesStudent.class);
+        boolean isSuccess = baseStudentBursariesStudentService.save(baseStudentBursariesStudent);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改助学金申请学生信息")
+    @SaCheckPermission("basestudentbursariesstudent:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBursariesStudentDto dto){
+
+        BaseStudentBursariesStudent baseStudentBursariesStudent = BeanUtil.toBean(dto, BaseStudentBursariesStudent.class);
+        return RT.ok(baseStudentBursariesStudentService.updateById(baseStudentBursariesStudent));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除助学金申请学生信息")
+    @SaCheckPermission("basestudentbursariesstudent:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentBursariesStudentService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,68 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBursariesProjectDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 助学金类型(xjr_dictionary_item[bursaries_type])
+    */
+    @ApiModelProperty("助学金类型(xjr_dictionary_item[bursaries_type])")
+    private String bursariesType;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,88 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBursariesStudentDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 助学金申请ID(base_student_bursaries_applicant)
+    */
+    @ApiModelProperty("助学金申请ID(base_student_bursaries_applicant)")
+    private Long baseStudentBursariesApplicantId;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String genderName;
+    /**
+    * 招生类型名称
+    */
+    @ApiModelProperty("招生类型名称")
+    private String enrollTypeCn;
+    /**
+    * 在读专业
+    */
+    @ApiModelProperty("在读专业")
+    private String majorName;
+    /**
+    * 收款银行(xjr_dictionary_item[bank_type])
+    */
+    @ApiModelProperty("收款银行(xjr_dictionary_item[bank_type])")
+    private String bankType;
+    /**
+    * 银行卡号
+    */
+    @ApiModelProperty("银行卡号")
+    private String bankNo;
+    /**
+    * 申请金额
+    */
+    @ApiModelProperty("申请金额")
+    private Double applicantAmount;
+
+}

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

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

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

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

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

@@ -0,0 +1,118 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_bursaries_project")
+@ApiModel(value = "base_student_bursaries_project", description = "助学金项目")
+public class BaseStudentBursariesProject 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[bursaries_type])
+    */
+    @ApiModelProperty("助学金类型(xjr_dictionary_item[bursaries_type])")
+    private String bursariesType;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

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

@@ -0,0 +1,101 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_bursaries_student")
+@ApiModel(value = "base_student_bursaries_student", description = "助学金申请学生信息")
+public class BaseStudentBursariesStudent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 助学金申请ID(base_student_bursaries_applicant)
+    */
+    @ApiModelProperty("助学金申请ID(base_student_bursaries_applicant)")
+    private Long baseStudentBursariesApplicantId;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String genderName;
+    /**
+    * 招生类型名称
+    */
+    @ApiModelProperty("招生类型名称")
+    private String enrollTypeCn;
+    /**
+    * 在读专业
+    */
+    @ApiModelProperty("在读专业")
+    private String majorName;
+    /**
+    * 收款银行(xjr_dictionary_item[bank_type])
+    */
+    @ApiModelProperty("收款银行(xjr_dictionary_item[bank_type])")
+    private String bankType;
+    /**
+    * 银行卡号
+    */
+    @ApiModelProperty("银行卡号")
+    private String bankNo;
+    /**
+    * 申请金额
+    */
+    @ApiModelProperty("申请金额")
+    private Double applicantAmount;
+
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBursariesProjectMapper.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.BaseStudentBursariesProject;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 助学金项目
+* @Author devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBursariesProjectMapper extends MPJBaseMapper<BaseStudentBursariesProject> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBursariesStudentMapper.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.BaseStudentBursariesStudent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 助学金申请学生信息
+* @Author devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBursariesStudentMapper extends MPJBaseMapper<BaseStudentBursariesStudent> {
+
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentBursariesProjectService.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.BaseStudentBursariesProject;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 助学金项目
+* @Author devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+
+public interface IBaseStudentBursariesProjectService extends MPJBaseService<BaseStudentBursariesProject> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentBursariesStudentService.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.BaseStudentBursariesStudent;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 助学金申请学生信息
+* @Author devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+
+public interface IBaseStudentBursariesStudentService extends MPJBaseService<BaseStudentBursariesStudent> {
+}

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentBursariesProjectServiceImpl.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.BaseStudentBursariesProject;
+import com.xjrsoft.module.student.mapper.BaseStudentBursariesProjectMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBursariesProjectService;
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBursariesProjectServiceImpl extends MPJBaseServiceImpl<BaseStudentBursariesProjectMapper, BaseStudentBursariesProject> implements IBaseStudentBursariesProjectService {
+}

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentBursariesStudentServiceImpl.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.BaseStudentBursariesStudent;
+import com.xjrsoft.module.student.mapper.BaseStudentBursariesStudentMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBursariesStudentService;
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBursariesStudentServiceImpl extends MPJBaseServiceImpl<BaseStudentBursariesStudentMapper, BaseStudentBursariesStudent> implements IBaseStudentBursariesStudentService {
+}

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

@@ -53,4 +53,60 @@ public class BaseStudentBursariesApplicantPageVo {
     @ApiModelProperty("状态（1:结束 0:未结束）")
     private Integer status;
 
+    /**
+     * 学生id
+     */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+     * 年级名称
+     */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String genderName;
+    /**
+     * 招生类型名称
+     */
+    @ApiModelProperty("招生类型名称")
+    private String enrollTypeCn;
+    /**
+     * 在读专业
+     */
+    @ApiModelProperty("在读专业")
+    private String majorName;
+    /**
+     * 收款银行(xjr_dictionary_item[bank_type])
+     */
+    @ApiModelProperty("收款银行(xjr_dictionary_item[bank_type])")
+    private String bankType;
+    /**
+     * 银行卡号
+     */
+    @ApiModelProperty("银行卡号")
+    private String bankNo;
+    /**
+     * 申请金额
+     */
+    @ApiModelProperty("申请金额")
+    private Double applicantAmount;
+
 }

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

@@ -0,0 +1,99 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBursariesProjectPageVo {
+
+    /**
+    * 主键编号
+    */
+    @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 name;
+    /**
+    * 助学金类型(xjr_dictionary_item[bursaries_type])
+    */
+    @ApiModelProperty("助学金类型(xjr_dictionary_item[bursaries_type])")
+    private String bursariesType;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,69 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBursariesProjectVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 助学金类型(xjr_dictionary_item[bursaries_type])
+    */
+    @ApiModelProperty("助学金类型(xjr_dictionary_item[bursaries_type])")
+    private String bursariesType;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

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

@@ -0,0 +1,89 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBursariesStudentPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 助学金申请ID(base_student_bursaries_applicant)
+    */
+    @ApiModelProperty("助学金申请ID(base_student_bursaries_applicant)")
+    private Long baseStudentBursariesApplicantId;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String genderName;
+    /**
+    * 招生类型名称
+    */
+    @ApiModelProperty("招生类型名称")
+    private String enrollTypeCn;
+    /**
+    * 在读专业
+    */
+    @ApiModelProperty("在读专业")
+    private String majorName;
+    /**
+    * 收款银行(xjr_dictionary_item[bank_type])
+    */
+    @ApiModelProperty("收款银行(xjr_dictionary_item[bank_type])")
+    private String bankType;
+    /**
+    * 银行卡号
+    */
+    @ApiModelProperty("银行卡号")
+    private String bankNo;
+    /**
+    * 申请金额
+    */
+    @ApiModelProperty("申请金额")
+    private Double applicantAmount;
+
+}

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

@@ -0,0 +1,89 @@
+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 devil
+* @Date: 2023-11-28
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBursariesStudentVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 助学金申请ID(base_student_bursaries_applicant)
+    */
+    @ApiModelProperty("助学金申请ID(base_student_bursaries_applicant)")
+    private Long baseStudentBursariesApplicantId;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 年级名称
+    */
+    @ApiModelProperty("年级名称")
+    private String gradeName;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String genderName;
+    /**
+    * 招生类型名称
+    */
+    @ApiModelProperty("招生类型名称")
+    private String enrollTypeCn;
+    /**
+    * 在读专业
+    */
+    @ApiModelProperty("在读专业")
+    private String majorName;
+    /**
+    * 收款银行(xjr_dictionary_item[bank_type])
+    */
+    @ApiModelProperty("收款银行(xjr_dictionary_item[bank_type])")
+    private String bankType;
+    /**
+    * 银行卡号
+    */
+    @ApiModelProperty("银行卡号")
+    private String bankNo;
+    /**
+    * 申请金额
+    */
+    @ApiModelProperty("申请金额")
+    private Double applicantAmount;
+
+
+
+}

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

@@ -762,6 +762,66 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    /**
+     * 助学金项目
+     */
+    @Test
+    public void gcBaseStudentBursariesProject() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_bursaries_project");//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("devil");//作者名称
+        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);
+    }
+
+    /**
+     * 助学金申请学生信息
+     */
+    @Test
+    public void gcBaseStudentBursariesStudent() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_bursaries_student");//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("devil");//作者名称
+        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);