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

# Conflicts:
#	src/main/java/com/xjrsoft/module/student/service/IBaseStudentScholarshipApplicantService.java
#	src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentScholarshipApplicantServiceImpl.java

src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java

@@ -160,10 +160,11 @@ public class MaterialTypeController {
         MPJLambdaWrapper<MaterialTypeAssign> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .disableSubLogicDel()
-                .eq(ObjectUtil.isNotEmpty(dto.getMaterialTypeId()) && dto.getMaterialTypeId() > 0, MaterialTypeAssign::getMaterialTypeId, dto.getMaterialTypeId())
                 .select(MaterialTypeAssign::getId)
-                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTypeAssign::getMaterialTypeId,ext->ext.selectAs(MaterialType::getName, MaterialTypeAssignVo::getMaterialTypeName))
+                .selectAs(XjrUser::getName,MaterialTypeAssignVo::getUserName)
                 .select(MaterialTypeAssign.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
+                .eq(ObjectUtil.isNotEmpty(dto.getMaterialTypeId()) && dto.getMaterialTypeId() > 0, MaterialTypeAssign::getMaterialTypeId, dto.getMaterialTypeId())
+                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTypeAssign::getMaterialTypeId,ext->ext.selectAs(MaterialType::getName, MaterialTypeAssignVo::getMaterialTypeName))
                 .innerJoin(XjrUser.class, XjrUser::getId, MaterialTypeAssign::getUserId, ext -> ext.selectAs(XjrUser::getUserName, MaterialTypeAssignVo::getUserName))
                 .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTypeAssign::getUserId)
                 .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId, ext -> ext.selectAs(Department::getName, MaterialTypeAssignVo::getDeptName))

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

@@ -59,7 +59,7 @@ public class BaseStudentBehaviorManageController {
         return RT.ok(ConventPage.getPageOutput(page, BaseStudentBehaviorManagePageVo.class));
     }
 
-    @GetMapping(value = "/miblie-page")
+    @GetMapping(value = "/mobile-page")
     @ApiOperation(value="学生操行分记录管理列表(移动端)")
     @SaCheckPermission("basestudentbehaviormanage:detail")
     public RT<PageOutput<BaseStudentBehaviorManageMobilePageVo>> mibliePage(@Valid BaseStudentBehaviorManageMobilePageDto dto){

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

@@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -26,6 +28,7 @@ import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectPageVo;
 
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -82,12 +85,14 @@ public class BaseStudentBehaviorProjectController {
     @SaCheckPermission("basestudentbehaviorproject:detail")
     public RT<PageOutput<BaseStudentBehaviorProjectPageVo>> page(@Valid BaseStudentBehaviorProjectPageDto dto) {
 
-        LambdaQueryWrapper<BaseStudentBehaviorProject> queryWrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<BaseStudentBehaviorProject> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
+                .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()))
+                .selectAs(DictionaryDetail::getName,BaseStudentBehaviorProjectPageVo::getScoreTypeCN)
                 .orderByDesc(BaseStudentBehaviorProject::getId)
                 .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()), BaseStudentBehaviorProject::getBaseStudentBehaviorCategoryId, dto.getBaseStudentBehaviorCategoryId())
-                .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()));
-        IPage<BaseStudentBehaviorProject> page = baseStudentBehaviorProjectService.page(ConventPage.getPage(dto), queryWrapper);
+                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseStudentBehaviorProject::getScoreType);
+        IPage<BaseStudentBehaviorProjectPageVo> page = baseStudentBehaviorProjectService.selectJoinListPage(ConventPage.getPage(dto),BaseStudentBehaviorProjectPageVo.class, queryWrapper);
         PageOutput<BaseStudentBehaviorProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorProjectPageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -0,0 +1,111 @@
+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;
+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) {
+
+        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);
+    }
+
+    @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/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/controller/BaseStudentCadreController.java

@@ -82,8 +82,6 @@ public class BaseStudentCadreController {
         return RT.ok(pageOutput);
     }
 
-
-
     @GetMapping(value = "/mobliepage")
     @ApiOperation(value="学生干部管理列表(移动端分页)")
     @SaCheckPermission("basestudentcadre:detail")
@@ -250,7 +248,7 @@ public class BaseStudentCadreController {
         return RT.ok(baseStudentCadreService.updateById(baseStudentCadre));
     }
 
-    @PutMapping("/editMobileStatus")
+    @PutMapping("/mobile-editStatus")
     @ApiOperation(value = "修改学生干部状态（离职、复职）移动端")
     @SaCheckPermission("basestudentcadre:edit")
     public RT<Boolean> editMobileStatus(@Valid @RequestBody UpdateBaseStudentCadreDto dto){

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

@@ -71,6 +71,7 @@ public class BaseStudentPostController {
         LambdaQueryWrapper<BaseStudentPost> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                 .eq(ObjectUtil.isNotNull(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
+                .eq(BaseStudentPost::getStatus,0)
                 .orderByDesc(BaseStudentPost::getId)
                 .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostListVo.class).contains(x.getProperty()));
 
@@ -87,6 +88,7 @@ public class BaseStudentPostController {
         IPage<BaseStudentPostPageVo> page = baseStudentPostService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPostPageVo.class,
                 MPJWrappers.<BaseStudentPost>lambdaJoin()
                         .orderByAsc(BaseStudentPost::getSortCode)
+                        .selectAs(BaseStudentPost::getId, BaseStudentPostPageVo::getId)
                 .selectAs(DictionaryDetail::getName, BaseStudentPostPageVo::getLevelCn)
                 .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostPageVo.class).contains(x.getProperty()))
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentPost::getLevel)
@@ -130,8 +132,7 @@ public class BaseStudentPostController {
     @ApiOperation(value = "删除学生职务设置")
     @SaCheckPermission("basestudentpost:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(baseStudentPostService.removeBatchByIds(ids));
-
+        return RT.ok(baseStudentPostService.deleteLogicallyBatchByIds(ids));
     }
 
     @GetMapping("/export")

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/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/BaseStudentBehaviorManageMobilePageDto.java

@@ -37,6 +37,12 @@ public class BaseStudentBehaviorManageMobilePageDto extends PageInput {
     @ApiModelProperty("考核人ids")
     private List<Long> assessmentUserIds;
 
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+
 
     /**
      * 考核时间-开始

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/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/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/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/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/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/BaseStudentBehaviorProjectMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface BaseStudentBehaviorProjectMapper extends BaseMapper<BaseStudentBehaviorProject> {
+public interface BaseStudentBehaviorProjectMapper extends MPJBaseMapper<BaseStudentBehaviorProject> {
 
 }

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/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/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/IBaseStudentBehaviorProjectService.java

@@ -13,5 +13,5 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IBaseStudentBehaviorProjectService extends IService<BaseStudentBehaviorProject> {
+public interface IBaseStudentBehaviorProjectService extends MPJBaseService<BaseStudentBehaviorProject> {
 }

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/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/IBaseStudentPostService.java

@@ -14,4 +14,11 @@ import java.util.List;
 */
 
 public interface IBaseStudentPostService extends MPJBaseService<BaseStudentPost> {
+
+    /**
+     * 删除学生职务设置（逻辑)
+     * @author phoenix
+     * @return
+     */
+    Boolean deleteLogicallyBatchByIds(List<Long> ids);
 }

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: 奖学金申请
@@ -21,4 +21,13 @@ public interface IBaseStudentScholarshipApplicantService extends MPJBaseService<
      * @return
      */
     Boolean processDataHandler(Long dataId);
+
+    /**
+     * app分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentScholarshipApplicantCategoryPageVo> getScholarshiPage(Page<BaseStudentScholarshipApplicantCategoryPageDto> page, BaseStudentScholarshipApplicantCategoryPageDto dto);
+
 }

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

@@ -21,5 +21,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class BaseStudentBehaviorProjectServiceImpl extends ServiceImpl<BaseStudentBehaviorProjectMapper, BaseStudentBehaviorProject> implements IBaseStudentBehaviorProjectService {
+public class BaseStudentBehaviorProjectServiceImpl extends MPJBaseServiceImpl<BaseStudentBehaviorProjectMapper, BaseStudentBehaviorProject> implements IBaseStudentBehaviorProjectService {
 }

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/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/service/impl/BaseStudentPostServiceImpl.java

@@ -1,13 +1,24 @@
 package com.xjrsoft.module.student.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.module.student.entity.BaseStudentCadre;
 import com.xjrsoft.module.student.entity.BaseStudentPost;
 import com.xjrsoft.module.student.mapper.BaseStudentPostMapper;
+import com.xjrsoft.module.student.service.IBaseStudentCadreService;
 import com.xjrsoft.module.student.service.IBaseStudentPostService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -22,4 +33,24 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class BaseStudentPostServiceImpl extends MPJBaseServiceImpl<BaseStudentPostMapper, BaseStudentPost> implements IBaseStudentPostService {
+
+
+    private final IBaseStudentCadreService baseStudentCadreService;
+
+    /**
+     * 删除学生职务设置（逻辑)
+     * @author phoenix
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteLogicallyBatchByIds(List<Long> ids){
+        QueryWrapper<BaseStudentCadre> queryWrapper = new QueryWrapper<>();
+
+        queryWrapper.in("post_id",ids);
+        Long count = baseStudentCadreService.count(queryWrapper);
+        if(ObjectUtil.isNotNull(count) && count > 0){
+            throw new MyException("有学生任职于选中的职务");
+        }
+        return removeBatchByIds(ids);
+    }
 }

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

@@ -1,22 +1,15 @@
 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.github.yulichang.toolkit.MPJWrappers;
-import com.xjrsoft.common.enums.GenderEnum;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.erpModel.caseErpMaterial.entity.CaseErpMaterial;
-import com.xjrsoft.module.erpModel.caseErpMaterial.entity.CaseErpMaterialClasses;
-import com.xjrsoft.module.erpModel.caseErpMaterial.entity.CaseErpMaterialProperty;
-import com.xjrsoft.module.erpModel.caseErpMaterial.vo.CaseErpMaterialInfoVo;
-import com.xjrsoft.module.erpModel.caseErpUnit.entity.CaseErpUnit;
-import com.xjrsoft.module.student.entity.BaseStudent;
+import com.xjrsoft.module.student.dto.BaseStudentScholarshipApplicantCategoryPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipApplicant;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.mapper.BaseStudentMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentScholarshipApplicantMapper;
 import com.xjrsoft.module.student.service.IBaseStudentScholarshipApplicantService;
 import com.xjrsoft.module.student.vo.StudentInfoVo;
+import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +29,12 @@ 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;
+    }
 
     private final BaseStudentScholarshipApplicantMapper scholarshipApplicantMapper;
 

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

@@ -80,6 +80,13 @@ public class BaseStudentBehaviorProjectPageVo {
     */
     @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
     private String scoreType;
+
+    /**
+     * 考核类型中文名(xjr_dictionary_item[score_type])
+     */
+    @ApiModelProperty("考核类型中文名(xjr_dictionary_item[score_type])")
+    private String scoreTypeCN;
+
     /**
     * 分值
     */

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

@@ -0,0 +1,112 @@
+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;
+
+    /**
+     * 学生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/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/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/main/java/com/xjrsoft/module/student/vo/BaseStudentPostListVo.java

@@ -29,49 +29,7 @@ public class BaseStudentPostListVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("主键编号")
     @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建人")
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建时间")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改人")
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改时间")
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("删除标记")
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("有效标志")
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
+    private Long id;
     /**
     * 序号
     */
@@ -86,33 +44,4 @@ public class BaseStudentPostListVo {
     @ExcelProperty("职务")
     @ApiModelProperty("职务")
     private String post;
-    /**
-    * 职务级别
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("职务级别")
-    @ApiModelProperty("职务级别")
-    private String level;
-    /**
-    * 是否允许德育检查(1:是 0:否)
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("是否允许德育检查(1:是 0:否)")
-    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
-    private Integer isAllowedCheck;
-    /**
-    * 职责描述
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("职责描述")
-    @ApiModelProperty("职责描述")
-    private String explains;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("是否启用(1:是 0:否)")
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-
 }

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

@@ -26,38 +26,9 @@ public class BaseStudentPostPageVo {
     /**
     * 主键编号
     */
-    @ContentStyle(dataFormat = 49)
     @ExcelProperty("主键编号")
     @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建人")
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建时间")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改人")
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改时间")
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
+    private Long id;
     /**
     * 删除标记
     */

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/BaseStudentBehaviorManageMapper.xml

@@ -69,6 +69,9 @@
         SELECT t1.sort_code,t1.name,t1.class_name,t.assessment_date,
         t3.name AS categoryName,t4.name AS projectName,t.score,t4.score_type  FROM base_student_behavior_manage t
         INNER JOIN base_student_behavior_student_relation t1 ON t1.base_student_behavior_manage_id = t.id
+        <if test="dto.studentName != null and dto.studentName != ''">
+            and t1.name like concat('%',#{dto.studentName},'%')
+        </if>
         LEFT JOIN xjr_user t2 ON t2.id = t.assessment_user_id
         LEFT JOIN base_student_behavior_category t3 ON t3.id = t.base_student_behavior_category_id
         LEFT JOIN base_student_behavior_project t4 ON t4.id = t.base_student_behavior_project_id

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");//作者名称
@@ -770,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);