Merge remote-tracking branch 'origin/dev' into dev

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

@@ -0,0 +1,94 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+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.service.IBaseStudentBursariesApplicantService;
+import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 助学金申请
+* @Author dzx
+* @Date: 2023-11-24
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseStudentBursariesApplicant")
+@Api(value = "/student"  + "/baseStudentBursariesApplicant",tags = "助学金申请代码")
+@AllArgsConstructor
+public class BaseStudentBursariesApplicantController {
+
+
+    private final IBaseStudentBursariesApplicantService baseStudentBursariesApplicantService;
+
+    @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);
+        PageOutput<BaseStudentBursariesApplicantPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBursariesApplicantPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询助学金申请信息")
+    @SaCheckPermission("basestudentbursariesapplicant:detail")
+    public RT<BaseStudentBursariesApplicantVo> info(@RequestParam Long id){
+        BaseStudentBursariesApplicant baseStudentBursariesApplicant = baseStudentBursariesApplicantService.getById(id);
+        if (baseStudentBursariesApplicant == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentBursariesApplicant, BaseStudentBursariesApplicantVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增助学金申请")
+    @SaCheckPermission("basestudentbursariesapplicant:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBursariesApplicantDto dto){
+        BaseStudentBursariesApplicant baseStudentBursariesApplicant = BeanUtil.toBean(dto, BaseStudentBursariesApplicant.class);
+        boolean isSuccess = baseStudentBursariesApplicantService.save(baseStudentBursariesApplicant);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改助学金申请")
+    @SaCheckPermission("basestudentbursariesapplicant:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBursariesApplicantDto dto){
+
+        BaseStudentBursariesApplicant baseStudentBursariesApplicant = BeanUtil.toBean(dto, BaseStudentBursariesApplicant.class);
+        return RT.ok(baseStudentBursariesApplicantService.updateById(baseStudentBursariesApplicant));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除助学金申请")
+    @SaCheckPermission("basestudentbursariesapplicant:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentBursariesApplicantService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 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;
@@ -12,11 +13,14 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.student.dto.AddBaseStudentScholarshipApplicantDto;
+import com.xjrsoft.module.student.dto.BaseStudentScholarshipApplicantCategoryPageDto;
 import com.xjrsoft.module.student.dto.BaseStudentScholarshipApplicantPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentScholarshipApplicantDto;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipApplicant;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipCategory;
 import com.xjrsoft.module.student.service.IBaseStudentScholarshipApplicantService;
+import com.xjrsoft.module.student.service.IBaseStudentScholarshipCategoryService;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantVo;
 import io.swagger.annotations.Api;
@@ -48,6 +52,7 @@ public class BaseStudentScholarshipApplicantController {
 
 
     private final IBaseStudentScholarshipApplicantService baseStudentScholarshipApplicantService;
+    private final IBaseStudentScholarshipCategoryService baseStudentScholarshipCategoryService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="奖学金申请列表(分页)")
@@ -71,6 +76,15 @@ public class BaseStudentScholarshipApplicantController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/scholarship-page")
+    @ApiOperation(value="奖学金名称表(分页)")
+    @SaCheckPermission("basestudentscholarshipapplicant:detail")
+    public RT<PageOutput<BaseStudentScholarshipApplicantCategoryPageVo>> scholarshiPage(@Valid BaseStudentScholarshipApplicantCategoryPageDto dto){
+        IPage<BaseStudentScholarshipApplicantCategoryPageVo> page = baseStudentScholarshipApplicantService.getScholarshiPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<BaseStudentScholarshipApplicantCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentScholarshipApplicantCategoryPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询奖学金申请信息")
     @SaCheckPermission("basestudentscholarshipapplicant:detail")

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

@@ -0,0 +1,63 @@
+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-24
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBursariesApplicantDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 助学金项目ID(base_student_bursaries_project)
+    */
+    @ApiModelProperty("助学金项目ID(base_student_bursaries_project)")
+    private Long baseStudentBursariesProjectId;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+}

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

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+* @title: 助学金申请分页查询入参
+* @Author dzx
+* @Date: 2023-11-24
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBursariesApplicantPageDto extends PageInput {
+
+    @NotNull(message = "助学金项目id不能为空！")
+    @ApiModelProperty("助学金项目id")
+    private Long projectId;
+}

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

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 奖学金申请分页查询入参
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentScholarshipApplicantCategoryPageDto extends PageInput {
+
+}

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

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

@@ -0,0 +1,113 @@
+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-24
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_bursaries_applicant")
+@ApiModel(value = "base_student_bursaries_applicant", description = "助学金申请")
+public class BaseStudentBursariesApplicant 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;
+    /**
+    * 助学金项目ID(base_student_bursaries_project)
+    */
+    @ApiModelProperty("助学金项目ID(base_student_bursaries_project)")
+    private Long baseStudentBursariesProjectId;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.BaseStudentBursariesApplicantPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBursariesApplicant;
+import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 助学金申请
+* @Author dzx
+* @Date: 2023-11-24
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBursariesApplicantMapper extends MPJBaseMapper<BaseStudentBursariesApplicant> {
+    /**
+     * 助学金申请名单查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentBursariesApplicantPageVo> getPage(Page<BaseStudentBursariesApplicantPageDto> page, BaseStudentBursariesApplicantPageDto dto);
+
+}

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

@@ -1,8 +1,10 @@
 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.BaseStudentScholarshipApplicantCategoryPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipApplicant;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,5 +15,11 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface BaseStudentScholarshipApplicantMapper extends MPJBaseMapper<BaseStudentScholarshipApplicant> {
-
+    /**
+     * app分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentScholarshipApplicantCategoryPageVo> getScholarshiPage(Page<BaseStudentScholarshipApplicantCategoryPageDto> page, BaseStudentScholarshipApplicantCategoryPageDto dto);
 }

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

@@ -0,0 +1,26 @@
+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.BaseStudentBursariesApplicantPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBursariesApplicant;
+import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo;
+
+/**
+* @title: 助学金申请
+* @Author dzx
+* @Date: 2023-11-24
+* @Version 1.0
+*/
+
+public interface IBaseStudentBursariesApplicantService extends MPJBaseService<BaseStudentBursariesApplicant> {
+
+    /**
+     * 助学金申请名单查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentBursariesApplicantPageVo> getPage(Page<BaseStudentBursariesApplicantPageDto> page, BaseStudentBursariesApplicantPageDto dto);
+
+}

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

@@ -1,10 +1,10 @@
 package com.xjrsoft.module.student.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.BaseStudentScholarshipApplicantCategoryPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipApplicant;
-import lombok.Data;
-import java.util.List;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo;
 
 /**
 * @title: 奖学金申请
@@ -14,4 +14,13 @@ import java.util.List;
 */
 
 public interface IBaseStudentScholarshipApplicantService extends MPJBaseService<BaseStudentScholarshipApplicant> {
+
+    /**
+     * app分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentScholarshipApplicantCategoryPageVo> getScholarshiPage(Page<BaseStudentScholarshipApplicantCategoryPageDto> page, BaseStudentScholarshipApplicantCategoryPageDto dto);
+
 }

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

@@ -0,0 +1,29 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.dto.BaseStudentBursariesApplicantPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBursariesApplicant;
+import com.xjrsoft.module.student.mapper.BaseStudentBursariesApplicantMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBursariesApplicantService;
+import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 助学金申请
+* @Author dzx
+* @Date: 2023-11-24
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBursariesApplicantServiceImpl extends MPJBaseServiceImpl<BaseStudentBursariesApplicantMapper, BaseStudentBursariesApplicant> implements IBaseStudentBursariesApplicantService {
+
+    private final BaseStudentBursariesApplicantMapper baseStudentBursariesApplicantMapper;
+    @Override
+    public Page<BaseStudentBursariesApplicantPageVo> getPage(Page<BaseStudentBursariesApplicantPageDto> page, BaseStudentBursariesApplicantPageDto dto) {
+        Page<BaseStudentBursariesApplicantPageVo> result = baseStudentBursariesApplicantMapper.getPage(page, dto);
+        return result;
+    }
+}

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

@@ -1,17 +1,14 @@
 package com.xjrsoft.module.student.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.dto.BaseStudentScholarshipApplicantCategoryPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipApplicant;
 import com.xjrsoft.module.student.mapper.BaseStudentScholarshipApplicantMapper;
 import com.xjrsoft.module.student.service.IBaseStudentScholarshipApplicantService;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo;
 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: 奖学金申请
@@ -22,4 +19,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class BaseStudentScholarshipApplicantServiceImpl extends MPJBaseServiceImpl<BaseStudentScholarshipApplicantMapper, BaseStudentScholarshipApplicant> implements IBaseStudentScholarshipApplicantService {
+    private final BaseStudentScholarshipApplicantMapper baseStudentScholarshipApplicantMapper;
+    @Override
+    public Page<BaseStudentScholarshipApplicantCategoryPageVo> getScholarshiPage(Page<BaseStudentScholarshipApplicantCategoryPageDto> page, BaseStudentScholarshipApplicantCategoryPageDto dto) {
+        Page<BaseStudentScholarshipApplicantCategoryPageVo> result = baseStudentScholarshipApplicantMapper.getScholarshiPage(page, dto);
+        return result;
+    }
 }

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

@@ -0,0 +1,56 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 助学金申请分页列表出参
+* @Author dzx
+* @Date: 2023-11-24
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBursariesApplicantPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 助学金项目ID(base_student_bursaries_project)
+    */
+    @ApiModelProperty("助学金项目ID(base_student_bursaries_project)")
+    private Long baseStudentBursariesProjectId;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+}

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

@@ -0,0 +1,64 @@
+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-24
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBursariesApplicantVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 助学金项目ID(base_student_bursaries_project)
+    */
+    @ApiModelProperty("助学金项目ID(base_student_bursaries_project)")
+    private Long baseStudentBursariesProjectId;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+
+}

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

@@ -0,0 +1,41 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 奖学金类别分页列表出参
+* @Author dzx
+* @Date: 2023-11-23
+* @Version 1.0
+*/
+@Data
+public class BaseStudentScholarshipApplicantCategoryPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty("奖金名称")
+    private String name;
+    /**
+    * 上报金额
+    */
+    @ApiModelProperty("上报金额")
+    private Double reportAmount;
+    /**
+    * 发放金额
+    */
+    @ApiModelProperty("发放金额")
+    private Double grantAmount;
+    /**
+    * 申请人数
+    */
+    @ApiModelProperty("申请人数")
+    private Integer applicantUserCount;
+
+}

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

@@ -0,0 +1,31 @@
+<?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.BaseStudentBursariesApplicantMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentBursariesApplicantPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo">
+        SELECT t2.name AS project_name,t2.start_time,t2.end_time,t4.name AS dictionary_name,
+        t3.student_id,t3.gender_name,t4.credential_type,t4.credential_number,t3.bank_type,t3.bank_no,t3.grade_name,
+        t3.class_name,t3.major_name,t3.enroll_type_cn,t3.applicant_amount,t1.status FROM base_student_bursaries_applicant t1
+        INNER JOIN base_student_bursaries_project t2 ON t1.base_student_bursaries_project_id = t2.id
+        INNER JOIN base_student_bursaries_student t3 ON t1.id = t3.base_student_bursaries_applicant_id
+        LEFT JOIN xjr_user t4 ON t3.user_id = t4.id
+        LEFT JOIN xjr_dictionary_detail t5 ON t2.bursaries_type = t5.code
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        AND t2.id = #{dto.projectId}
+        ORDER BY t1.sort_code
+    </select>
+    <select id="getProjectPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentBursariesApplicantPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo">
+        SELECT t2.name AS project_name,t2.start_time,t2.end_time,t4.name AS dictionary_name,
+        t3.student_id,t3.gender_name,t4.credential_type,t4.credential_number,t3.bank_type,t3.bank_no,t3.grade_name,
+        t3.class_name,t3.major_name,t3.enroll_type_cn,t3.applicant_amount,t1.status FROM base_student_bursaries_applicant t1
+        INNER JOIN base_student_bursaries_project t2 ON t1.base_student_bursaries_project_id = t2.id
+        INNER JOIN base_student_bursaries_student t3 ON t1.id = t3.base_student_bursaries_applicant_id
+        LEFT JOIN xjr_user t4 ON t3.user_id = t4.id
+        LEFT JOIN xjr_dictionary_detail t5 ON t2.bursaries_type = t5.code
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        AND t2.id = #{dto.projectId}
+        ORDER BY t1.sort_code
+    </select>
+
+</mapper>

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

@@ -0,0 +1,26 @@
+<?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.BaseStudentScholarshipApplicantMapper">
+    <select id="getScholarshiPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentScholarshipApplicantPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo">
+        SELECT t.id, t.name,(
+            SELECT SUM(t2.amount) FROM base_student_scholarship_applicant t1
+                                           INNER JOIN base_student_scholarship_level t2 ON t1.scholarship_level = t2.level
+            WHERE t1.base_student_scholarship_category_id = t.id
+              AND t1.release_status = 0
+        ) AS report_amount,
+               (
+                   SELECT SUM(t2.amount) FROM base_student_scholarship_applicant t1
+                                                  INNER JOIN base_student_scholarship_level t2 ON t1.scholarship_level = t2.level
+                   WHERE t1.base_student_scholarship_category_id = t.id
+                     AND t1.release_status = 1
+               ) AS grant_amount,(
+                   SELECT COUNT(*) FROM base_student_scholarship_applicant
+                   WHERE base_student_scholarship_category_id = t.id
+               ) AS applicant_user_count FROM base_student_scholarship_category t
+        WHERE delete_mark = 0
+    </select>
+
+
+</mapper>

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

@@ -716,20 +716,12 @@ public class FreeMarkerGeneratorTest {
     public void gcBaseStudentScholarshipCategory() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
-        mainTable.setTableName("base_student_scholarship_category");//init_sql中的表名
+        mainTable.setTableName("base_student_bursaries_applicant");//init_sql中的表名
         mainTable.setIsMain(true);//是否是主表，一般默认为true
         mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
         mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
         tableConfigs.add(mainTable);
 
-        mainTable = new TableConfig();
-        mainTable.setTableName("base_student_scholarship_level");//init_sql中的表名
-        mainTable.setIsMain(false);//是否是主表，一般默认为true
-        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
-        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
-        mainTable.setRelationField("base_student_scholarship_category_id");//设置外键
-        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
-        tableConfigs.add(mainTable);
 
         ApiGenerateCodesDto params = new ApiGenerateCodesDto();
         params.setAuthor("dzx");//作者名称