diff --git a/backend/add_create_dept.sql b/backend/add_create_dept.sql
new file mode 100644
index 00000000..71ddce64
--- /dev/null
+++ b/backend/add_create_dept.sql
@@ -0,0 +1 @@
+ALTER TABLE jcbt_scholarship_type ADD COLUMN create_dept BIGINT(20) COMMENT '创建部门' AFTER is_system;
diff --git a/backend/debug_compatibility_type.sql b/backend/debug_compatibility_type.sql
new file mode 100644
index 00000000..86b790d5
--- /dev/null
+++ b/backend/debug_compatibility_type.sql
@@ -0,0 +1,30 @@
+-- 调试compatibility_type字段问题
+-- 检查表结构
+DESCRIBE jcbt_scholarship_type;
+
+-- 检查字段是否存在
+SHOW COLUMNS FROM jcbt_scholarship_type LIKE 'compatibility_type';
+
+-- 查看具体数据
+SELECT id, type_name, compatibility_type,
+ CASE
+ WHEN compatibility_type IS NULL THEN 'NULL值'
+ WHEN compatibility_type = '' THEN '空字符串'
+ ELSE CONCAT('有值:', compatibility_type)
+ END as value_status
+FROM jcbt_scholarship_type
+WHERE deleted = 0
+LIMIT 10;
+
+-- 统计各种值的分布
+SELECT
+ compatibility_type,
+ COUNT(*) as count,
+ CASE
+ WHEN compatibility_type IS NULL THEN 'NULL值'
+ WHEN compatibility_type = '' THEN '空字符串'
+ ELSE '有效值'
+ END as value_type
+FROM jcbt_scholarship_type
+WHERE deleted = 0
+GROUP BY compatibility_type;
diff --git a/backend/fix_compatibility_create_dept.sql b/backend/fix_compatibility_create_dept.sql
new file mode 100644
index 00000000..b025492b
--- /dev/null
+++ b/backend/fix_compatibility_create_dept.sql
@@ -0,0 +1,36 @@
+-- =====================================================
+-- 奖学金兼得关系表 - create_dept字段修复脚本
+-- 版本: v1.0
+-- 创建时间: 2025-01-27
+-- 问题描述: 实体类继承BaseEntity包含create_dept字段，但数据库表缺少该字段
+-- 解决方案: 为jcbt_scholarship_compatibility表添加create_dept字段
+-- =====================================================
+
+USE `ruoyi-vue-pro`;
+
+-- 为奖学金兼得关系表添加create_dept字段
+ALTER TABLE `jcbt_scholarship_compatibility`
+ADD COLUMN IF NOT EXISTS `create_dept` BIGINT(20) COMMENT '创建部门'
+AFTER `description`;
+
+-- 验证字段添加结果
+SELECT
+ COLUMN_NAME,
+ DATA_TYPE,
+ IS_NULLABLE,
+ COLUMN_DEFAULT,
+ COLUMN_COMMENT
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = 'ruoyi-vue-pro'
+ AND TABLE_NAME = 'jcbt_scholarship_compatibility'
+ AND COLUMN_NAME = 'create_dept';
+
+-- 显示表结构确认修复结果
+DESCRIBE `jcbt_scholarship_compatibility`;
+
+-- =====================================================
+-- 修复说明：
+-- 1. 该字段是BaseEntity的标准字段，用于记录创建部门
+-- 2. 字段类型为BIGINT(20)，允许NULL，与其他表保持一致
+-- 3. 字段位置放在description字段之后，符合标准字段顺序
+-- =====================================================
diff --git a/backend/quota_diagnosis_results.txt b/backend/quota_diagnosis_results.txt
new file mode 100644
index 00000000..608d9f21
--- /dev/null
+++ b/backend/quota_diagnosis_results.txt
@@ -0,0 +1,37 @@
+mysql: [Warning] Using a password on the command line interface can be insecure.
+info
+=== 1. 班主任和班级信息检查 ===
+info
+=== 2. 奖学金批次信息检查 ===
+batch_id batch_name batch_status start_time end_time create_time
+1952730449122004993 2025-2026??????????????? ACTIVE 2025-08-05 00:00:00 2025-08-29 00:00:00 2025-08-05 21:56:34
+1 2024-2025??????????? ACTIVE 2024-09-01 00:00:00 2024-12-31 23:59:59 2025-08-05 09:04:39
+info
+=== 3. 奖学金类型信息检查 ===
+type_id type_name level_type type_status batch_id batch_name
+1 ??????? FIRST 1 1953330495479644161 2025-2026?????????????
+1 ??????? FIRST 1 1952730449122004993 2025-2026???????????????
+5 ????????? FIRST 1 1952730449122004993 2025-2026???????????????
+1953004971846852609 ??????? FIRST 1 1952730449122004993 2025-2026???????????????
+6 ????????? FIRST 1 NULL NULL
+2 ??????? SECOND 1 1953330495479644161 2025-2026?????????????
+2 ??????? SECOND 1 1952730449122004993 2025-2026???????????????
+1953005237862195202 ??????? SECOND 1 1952730449122004993 2025-2026???????????????
+7 ????????? SECOND 1 NULL NULL
+1953004602014097409 ??????? SPECIAL 1 1952730449122004993 2025-2026???????????????
+4 ????????? SPECIAL 1 1952730449122004993 2025-2026???????????????
+8 ??????? SPECIAL 1 NULL NULL
+1952634577994387457 ????? SPECIAL 1 1952730449122004993 2025-2026???????????????
+1953004324552499202 ?????? SPECIAL 1 1952730449122004993 2025-2026???????????????
+3 ??????? THIRD 1 1952730449122004993 2025-2026???????????????
+1953005415696490497 ??????? THIRD 1 1952730449122004993 2025-2026???????????????
+info
+=== 4. 班级名额分配情况检查 ===
+quota_id batch_id batch_name scholarship_type_id type_name class_id class_name total_quota used_quota available_quota allocation_method status create_time
+2001 1 2024-2025??????????? 1 ??????? 1001 NULL 2 0 2 MANUAL ACTIVE 2025-08-06 11:00:49
+2003 1 2024-2025??????????? 2 ??????? 1001 NULL 3 0 2 MANUAL ACTIVE 2025-08-06 11:00:49
+2002 1 2024-2025??????????? 1 ??????? 1002 NULL 1 0 1 MANUAL ACTIVE 2025-08-06 11:00:49
+2004 1 2024-2025??????????? 2 ??????? 1002 NULL 2 0 2 MANUAL ACTIVE 2025-08-06 11:00:49
+info
+=== 5. 已使用名额情况检查 ===
+ERROR 1054 (42S22) at line 87: Unknown column 'sa.applicant_class_id' in 'field list'
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/pom.xml b/backend/ruoyi-modules/ruoyi-jcbt/pom.xml
new file mode 100644
index 00000000..d294f710
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/pom.xml
@@ -0,0 +1,115 @@
+
+
+
+ ruoyi-modules
+ org.dromara
+ ${revision}
+
+ 4.0.0
+
+ ruoyi-jcbt
+
+ 奖惩补贴管理模块
+
+
+
+
+
+
+ org.dromara
+ ruoyi-common-core
+
+
+
+ org.dromara
+ ruoyi-common-doc
+
+
+
+ org.dromara
+ ruoyi-common-mybatis
+
+
+
+ org.dromara
+ ruoyi-common-log
+
+
+
+ org.dromara
+ ruoyi-common-security
+
+
+
+ org.dromara
+ ruoyi-common-web
+
+
+
+ org.dromara
+ ruoyi-common-excel
+
+
+
+ org.dromara
+ ruoyi-common-idempotent
+
+
+
+ org.dromara
+ ruoyi-common-tenant
+
+
+
+ org.dromara
+ ruoyi-common-social
+
+
+
+ org.dromara
+ ruoyi-common-ratelimiter
+
+
+
+ org.dromara
+ ruoyi-common-mail
+
+
+
+ org.dromara
+ ruoyi-system
+
+
+
+ org.dromara
+ ruoyi-job
+
+
+
+
+ org.dromara
+ ruoyi-generator
+
+
+
+
+ org.dromara
+ ruoyi-demo
+
+
+
+
+ org.dromara
+ ruoyi-workflow
+
+
+
+
+ org.dromara
+ ruoyi-xg
+
+
+
+
+
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/RuoyiJcbtApplication.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/RuoyiJcbtApplication.java
new file mode 100644
index 00000000..ebd48cbe
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/RuoyiJcbtApplication.java
@@ -0,0 +1,19 @@
+package org.dromara.jcbt;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 奖惩补贴管理模块启动程序
+ *
+ * @author ruoyi
+ */
+@SpringBootApplication
+public class RuoyiJcbtApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(RuoyiJcbtApplication.class, args);
+ System.out.println("(♥◠‿◠)ﾉﾞ 奖惩补贴管理模块启动成功 ლ(´ڡ`ლ)ﾞ");
+ }
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/.gitkeep b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java
new file mode 100644
index 00000000..a7e0e6b9
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java
@@ -0,0 +1,339 @@
+package org.dromara.jcbt.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.jcbt.domain.bo.JcbtScholarshipApplicationBo;
+import org.dromara.jcbt.domain.vo.JcbtScholarshipApplicationVo;
+import org.dromara.jcbt.service.IJcbtScholarshipApplicationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * 奖学金申请记录管理
+ *
+ * @author ruoyi
+ * @date 2025-01-01
+ */
+@Validated
+@Tag(name = "奖学金申请记录管理", description = "奖学金申请记录管理Controller")
+@RestController
+@RequestMapping("/jcbt/scholarshipApplication")
+public class JcbtScholarshipApplicationController extends BaseController {
+
+ @Autowired
+ private IJcbtScholarshipApplicationService applicationService;
+
+ // ========== 基础管理接口（6个） ==========
+
+ /**
+ * 查询奖学金申请记录列表
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:list")
+ @GetMapping("/list")
+ @Operation(summary = "查询奖学金申请记录列表")
+ public TableDataInfo list(JcbtScholarshipApplicationBo bo, PageQuery pageQuery) {
+ return applicationService.queryPageList(bo, pageQuery);
+ }
+
+ /**
+ * 获取奖学金申请记录详细信息
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:query")
+ @GetMapping("/{id}")
+ @Operation(summary = "获取奖学金申请记录详细信息")
+ public R getInfo(@Parameter(description = "主键") @PathVariable Long id) {
+ return R.ok(applicationService.queryById(id));
+ }
+
+ /**
+ * 新增奖学金申请记录
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:add")
+ @Log(title = "奖学金申请记录", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping
+ @Operation(summary = "新增奖学金申请记录")
+ public R add(@Parameter(description = "奖学金申请记录") @Validated(AddGroup.class) @RequestBody JcbtScholarshipApplicationBo bo) {
+ return toAjax(applicationService.insertByBo(bo));
+ }
+
+ /**
+ * 修改奖学金申请记录
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:edit")
+ @Log(title = "奖学金申请记录", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping
+ @Operation(summary = "修改奖学金申请记录")
+ public R edit(@Parameter(description = "奖学金申请记录") @Validated(EditGroup.class) @RequestBody JcbtScholarshipApplicationBo bo) {
+ return toAjax(applicationService.updateByBo(bo));
+ }
+
+ /**
+ * 删除奖学金申请记录
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:remove")
+ @Log(title = "奖学金申请记录", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ @Operation(summary = "删除奖学金申请记录")
+ public R remove(@Parameter(description = "主键串") @PathVariable Long[] ids) {
+ return toAjax(applicationService.deleteWithValidByIds(List.of(ids), true));
+ }
+
+ /**
+ * 获取可申请的奖学金类型列表
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:available")
+ @GetMapping("/available")
+ @Operation(summary = "获取可申请的奖学金类型列表")
+ public R>> getAvailableScholarshipTypes(@Parameter(description = "班级ID") @RequestParam Long classId,
+ @Parameter(description = "批次ID") @RequestParam Long batchId) {
+ return R.ok(applicationService.queryAvailableScholarshipTypes(classId, batchId));
+ }
+
+ // ========== 业务功能接口（4个） ==========
+
+ /**
+ * 查询我的申请记录（班主任）
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:my")
+ @GetMapping("/my")
+ @Operation(summary = "查询我的申请记录")
+ public R> getMyApplications(@Parameter(description = "申请人ID") @RequestParam Long applicantId,
+ @Parameter(description = "批次ID") @RequestParam(required = false) Long batchId) {
+ return R.ok(applicationService.queryApplicationsByApplicant(applicantId, batchId));
+ }
+
+ /**
+ * 查询待审核申请
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:pending")
+ @GetMapping("/pending")
+ @Operation(summary = "查询待审核申请")
+ public R> getPendingApplications(@Parameter(description = "审核人ID") @RequestParam(required = false) Long reviewerId,
+ @Parameter(description = "申请状态") @RequestParam(required = false) String status) {
+ return R.ok(applicationService.queryPendingApplications(reviewerId, status));
+ }
+
+ /**
+ * 检查学生申请资格
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:check")
+ @GetMapping("/check")
+ @Operation(summary = "检查学生申请资格")
+ public R> checkStudentEligibility(@Parameter(description = "学生ID") @RequestParam Long studentId,
+ @Parameter(description = "批次ID") @RequestParam Long batchId,
+ @Parameter(description = "奖学金类型ID") @RequestParam Long scholarshipTypeId) {
+ return R.ok(applicationService.checkStudentEligibility(studentId, batchId, scholarshipTypeId));
+ }
+
+ /**
+ * 批量审核申请
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:approve")
+ @Log(title = "批量审核奖学金申请", businessType = BusinessType.UPDATE)
+ @PostMapping("/approve")
+ @Operation(summary = "批量审核申请")
+ public R batchApprove(@Parameter(description = "申请ID列表") @RequestBody @NotEmpty List applicationIds,
+ @Parameter(description = "审核状态") @RequestParam String status,
+ @Parameter(description = "审核人ID") @RequestParam Long reviewerId,
+ @Parameter(description = "审核人姓名") @RequestParam String reviewerName,
+ @Parameter(description = "审核意见") @RequestParam(required = false) String reviewComment) {
+ return toAjax(applicationService.batchReviewApplications(applicationIds, status, reviewerId, reviewerName, reviewComment));
+ }
+
+ // ========== 辅助功能接口（6个） ==========
+
+ /**
+ * 导出奖学金申请记录列表
+ */
+ @SaCheckPermission("jcbt:schotlarshipApplication:expor")
+ @Log(title = "奖学金申请记录", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @Operation(summary = "导出奖学金申请记录列表")
+ public void export(JcbtScholarshipApplicationBo bo, HttpServletResponse response) {
+ List list = applicationService.queryList(bo);
+ ExcelUtil.exportExcel(list, "奖学金申请记录", JcbtScholarshipApplicationVo.class, response);
+ }
+
+ /**
+ * 导入奖学金申请记录
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:import")
+ @Log(title = "奖学金申请记录", businessType = BusinessType.IMPORT)
+ @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @Operation(summary = "导入奖学金申请记录")
+ public R importData(@Parameter(description = "Excel文件") @RequestPart("file") MultipartFile file) throws Exception {
+ List list = ExcelUtil.importExcel(file.getInputStream(), JcbtScholarshipApplicationVo.class);
+ // 导入逻辑处理
+ for (JcbtScholarshipApplicationVo vo : list) {
+ JcbtScholarshipApplicationBo bo = new JcbtScholarshipApplicationBo();
+ // 这里需要实现VO到BO的转换逻辑
+ // BeanUtils.copyProperties(vo, bo);
+ applicationService.insertByBo(bo);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 获取申请统计数据
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:statistics")
+ @GetMapping("/statistics")
+ @Operation(summary = "获取申请统计数据")
+ public R> getStatistics(@Parameter(description = "批次ID") @RequestParam(required = false) Long batchId,
+ @Parameter(description = "学院ID") @RequestParam(required = false) Long deptId) {
+ return R.ok(applicationService.getApplicationStatistics(batchId, deptId));
+ }
+
+ /**
+ * 班主任批量申请提交
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:batch")
+ @Log(title = "班主任批量申请提交", businessType = BusinessType.INSERT)
+ @PostMapping("/batch")
+ @Operation(summary = "班主任批量申请提交")
+ public R batchSubmitByTeacher(@Parameter(description = "批次ID") @RequestParam Long batchId,
+ @Parameter(description = "奖学金类型ID") @RequestParam Long scholarshipTypeId,
+ @Parameter(description = "班级ID") @RequestParam Long classId,
+ @Parameter(description = "学生申请列表") @RequestBody @NotEmpty List studentApplications) {
+ return toAjax(applicationService.batchSubmitApplicationsByTeacher(batchId, scholarshipTypeId, classId, studentApplications));
+ }
+
+ /**
+ * 提交申请
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:submit")
+ @Log(title = "提交奖学金申请", businessType = BusinessType.UPDATE)
+ @PostMapping("/{id}/submit")
+ @Operation(summary = "提交申请")
+ public R submitApplication(@Parameter(description = "申请ID") @PathVariable @NotNull Long id) {
+ return toAjax(applicationService.submitApplication(id));
+ }
+
+ /**
+ * 撤回申请
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:withdraw")
+ @Log(title = "撤回奖学金申请", businessType = BusinessType.UPDATE)
+ @PostMapping("/{id}/withdraw")
+ @Operation(summary = "撤回申请")
+ public R withdrawApplication(@Parameter(description = "申请ID") @PathVariable @NotNull Long id,
+ @Parameter(description = "撤回原因") @RequestParam(required = false) String reason) {
+ return toAjax(applicationService.withdrawApplication(id, reason));
+ }
+
+ // ========== 班级名额相关接口 ==========
+
+ /**
+ * 获取班级名额使用情况
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:quota")
+ @GetMapping("/quota")
+ @Operation(summary = "获取班级名额使用情况")
+ public R> getClassQuotaUsage(@Parameter(description = "班级ID") @RequestParam Long classId,
+ @Parameter(description = "批次ID") @RequestParam Long batchId) {
+ return R.ok(applicationService.getClassQuotaUsage(classId, batchId));
+ }
+
+ // ========== 班主任申请专用接口 ==========
+
+ /**
+ * 获取班主任所带班级信息
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:classInfo")
+ @GetMapping("/classInfo")
+ @Operation(summary = "获取班主任所带班级信息")
+ public R> getClassInfoByTeacher(@Parameter(description = "班主任ID") @RequestParam Long teacherId) {
+ return R.ok(applicationService.getClassInfoByTeacher(teacherId));
+ }
+
+ /**
+ * 获取班级学生列表（用于勾选）
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:students")
+ @GetMapping("/students")
+ @Operation(summary = "获取班级学生列表")
+ public R>> getClassStudents(@Parameter(description = "班级ID") @RequestParam Long classId) {
+ return R.ok(applicationService.getClassStudents(classId));
+ }
+
+ /**
+ * 根据批次获取可申请的奖学金类型
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
+ @GetMapping("/scholarshipTypes")
+ @Operation(summary = "根据批次获取可申请的奖学金类型")
+ public R>> getScholarshipTypesByBatch(@Parameter(description = "批次ID") @RequestParam Long batchId) {
+ return R.ok(applicationService.getScholarshipTypesByBatch(batchId));
+ }
+
+ /**
+ * 根据批次和班级获取带名额信息的奖学金类型（班主任专用）
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
+ @GetMapping("/scholarshipTypesWithQuota")
+ @Operation(summary = "根据批次和班级获取带名额信息的奖学金类型")
+ public R>> getScholarshipTypesWithQuota(
+ @Parameter(description = "批次ID") @RequestParam Long batchId,
+ @Parameter(description = "班级ID") @RequestParam Long classId) {
+ return R.ok(applicationService.getScholarshipTypesWithQuota(batchId, classId));
+ }
+
+ /**
+ * 确认选择班级（多班级时用户选择后调用）
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:classInfo")
+ @PostMapping("/confirmClass")
+ @Operation(summary = "确认选择班级")
+ public R> confirmClassSelection(@Parameter(description = "班主任ID") @RequestParam Long teacherId,
+ @Parameter(description = "班级ID") @RequestParam Long classId) {
+ return R.ok(applicationService.confirmClassSelection(teacherId, classId));
+ }
+
+ /**
+ * 测试接口：获取奖学金类型数据结构
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
+ @GetMapping("/test/scholarshipTypesStructure")
+ @Operation(summary = "测试接口：获取奖学金类型数据结构")
+ public R> testScholarshipTypesStructure(@Parameter(description = "批次ID") @RequestParam Long batchId,
+ @Parameter(description = "班级ID") @RequestParam(required = false) Long classId) {
+ Map result = new HashMap<>();
+ try {
+ if (classId != null) {
+ result.put("withQuota", applicationService.getScholarshipTypesWithQuota(batchId, classId));
+ }
+ result.put("withoutQuota", applicationService.getScholarshipTypesByBatch(batchId));
+ result.put("batchId", batchId);
+ result.put("classId", classId);
+ result.put("timestamp", System.currentTimeMillis());
+ } catch (Exception e) {
+ result.put("error", e.getMessage());
+ }
+ return R.ok(result);
+ }
+}
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java
new file mode 100644
index 00000000..b54cb624
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java
@@ -0,0 +1,180 @@
+package org.dromara.jcbt.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.jcbt.domain.vo.JcbtScholarshipBatchVo;
+import org.dromara.jcbt.domain.bo.JcbtScholarshipBatchBo;
+import org.dromara.jcbt.service.IJcbtScholarshipBatchService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.log.enums.BusinessType;
+
+/**
+ * 奖学金评定批次
+ *
+ * @author ruoyi
+ * @date 2025-01-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jcbt/scholarshipBatch")
+@Slf4j
+public class JcbtScholarshipBatchController extends BaseController {
+
+ private final IJcbtScholarshipBatchService scholarshipBatchService;
+
+ /**
+ * 查询奖学金评定批次列表
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:list")
+ @GetMapping("/list")
+ public TableDataInfo list(JcbtScholarshipBatchBo bo, PageQuery pageQuery) {
+ return scholarshipBatchService.queryPageList(bo, pageQuery);
+ }
+
+ /**
+ * 导出奖学金评定批次列表
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:export")
+ @Log(title = "奖学金评定批次", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(JcbtScholarshipBatchBo bo, HttpServletResponse response) {
+ List list = scholarshipBatchService.queryExportList(bo);
+ ExcelUtil.exportExcel(list, "奖学金评定批次", JcbtScholarshipBatchVo.class, response);
+ }
+
+ /**
+ * 获取奖学金评定批次详细信息
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @GetMapping("/{id}")
+ public R getInfo(@NotNull(message = "主键不能为空")
+ @PathVariable Long id) {
+ return R.ok(scholarshipBatchService.queryById(id));
+ }
+
+ /**
+ * 新增奖学金评定批次
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:add")
+ @Log(title = "奖学金评定批次", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping()
+ public R add(@Validated(AddGroup.class) @RequestBody JcbtScholarshipBatchBo bo) {
+ return toAjax(scholarshipBatchService.insertByBo(bo));
+ }
+
+ /**
+ * 修改奖学金评定批次
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:edit")
+ @Log(title = "奖学金评定批次", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping()
+ public R edit(@Validated(EditGroup.class) @RequestBody JcbtScholarshipBatchBo bo) {
+ return toAjax(scholarshipBatchService.updateByBo(bo));
+ }
+
+ /**
+ * 删除奖学金评定批次
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:remove")
+ @Log(title = "奖学金评定批次", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@NotEmpty(message = "主键不能为空")
+ @PathVariable Long[] ids) {
+ return toAjax(scholarshipBatchService.deleteWithValidByIds(List.of(ids), true));
+ }
+
+ /**
+ * 根据批次编码查询批次信息
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @GetMapping("/getByCode/{batchCode}")
+ public R getByBatchCode(@PathVariable String batchCode) {
+ return R.ok(scholarshipBatchService.queryByBatchCode(batchCode));
+ }
+
+ /**
+ * 根据学年和学期查询批次列表
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @GetMapping("/getByAcademicYear")
+ public R> getByAcademicYearAndSemester(
+ @RequestParam String academicYear,
+ @RequestParam(required = false) Integer semester) {
+ return R.ok(scholarshipBatchService.queryByAcademicYearAndSemester(academicYear, semester));
+ }
+
+ /**
+ * 查询启用状态的批次列表
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @GetMapping("/getActiveBatches")
+ public R> getActiveBatches() {
+ return R.ok(scholarshipBatchService.queryActiveBatches());
+ }
+
+ /**
+ * 检查批次编码是否唯一
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @GetMapping("/checkBatchCodeUnique")
+ public R checkBatchCodeUnique(@RequestParam String batchCode,
+ @RequestParam(required = false) Long id) {
+ return R.ok(scholarshipBatchService.checkBatchCodeUnique(batchCode, id));
+ }
+
+ /**
+ * 更改批次状态
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:edit")
+ @Log(title = "奖学金评定批次", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public R changeStatus(@RequestParam Long id, @RequestParam String status) {
+ return toAjax(scholarshipBatchService.changeStatus(id, status));
+ }
+
+ /**
+ * 查询当前进行中的批次
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @GetMapping("/getCurrentActiveBatches")
+ public R> getCurrentActiveBatches() {
+ return R.ok(scholarshipBatchService.queryCurrentActiveBatches());
+ }
+
+ /**
+ * 根据状态查询批次列表
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @GetMapping("/getByStatus/{status}")
+ public R> getByStatus(@PathVariable String status) {
+ return R.ok(scholarshipBatchService.queryByStatus(status));
+ }
+
+ /**
+ * 检查批次时间是否有冲突
+ */
+ @SaCheckPermission("jcbt:scholarshipBatch:query")
+ @PostMapping("/checkTimeConflict")
+ public R checkTimeConflict(@RequestBody JcbtScholarshipBatchBo bo) {
+ return R.ok(scholarshipBatchService.checkTimeConflict(bo));
+ }
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java
new file mode 100644
index 00000000..f35a5477
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java
@@ -0,0 +1,248 @@
+package org.dromara.jcbt.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.jcbt.domain.bo.JcbtScholarshipQuotaBo;
+import org.dromara.jcbt.domain.vo.JcbtScholarshipQuotaVo;
+import org.dromara.jcbt.service.IJcbtScholarshipQuotaService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 奖学金名额分配
+ *
+ * @author ruoyi
+ * @date 2025-01-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jcbt/scholarshipQuota")
+public class JcbtScholarshipQuotaController extends BaseController {
+
+ private final IJcbtScholarshipQuotaService scholarshipQuotaService;
+
+ /**
+ * 查询奖学金名额分配列表
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:list")
+ @GetMapping("/list")
+ public TableDataInfo list(JcbtScholarshipQuotaBo bo, PageQuery pageQuery) {
+ return scholarshipQuotaService.queryPageList(bo, pageQuery);
+ }
+
+ /**
+ * 查询指定批次的名额分配列表
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:list")
+ @GetMapping("/listByBatch/{batchId}")
+ public R> listByBatch(@PathVariable Long batchId) {
+ List list = scholarshipQuotaService.queryListByBatchId(batchId);
+ return R.ok(list);
+ }
+
+ /**
+ * 查询指定批次和奖学金类型的名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:list")
+ @GetMapping("/listByBatchAndType")
+ public R> listByBatchAndType(@RequestParam Long batchId,
+ @RequestParam Long scholarshipTypeId) {
+ List list = scholarshipQuotaService.queryListByBatchAndType(batchId, scholarshipTypeId);
+ return R.ok(list);
+ }
+
+ /**
+ * 查询名额分配树形结构
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:list")
+ @GetMapping("/tree")
+ public R> tree(@RequestParam Long batchId,
+ @RequestParam Long scholarshipTypeId) {
+ List tree = scholarshipQuotaService.queryQuotaTree(batchId, scholarshipTypeId);
+ return R.ok(tree);
+ }
+
+ /**
+ * 查询名额使用统计
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:list")
+ @GetMapping("/statistics/{batchId}")
+ public R> statistics(@PathVariable Long batchId) {
+ Map statistics = scholarshipQuotaService.queryQuotaUsageStatistics(batchId);
+ return R.ok(statistics);
+ }
+
+ /**
+ * 导出奖学金名额分配列表
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:export")
+ @Log(title = "导出奖学金名额分配", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(JcbtScholarshipQuotaBo bo, HttpServletResponse response) {
+ List list = scholarshipQuotaService.queryList(bo);
+ ExcelUtil.exportExcel(list, "奖学金名额分配", JcbtScholarshipQuotaVo.class, response);
+ }
+
+ /**
+ * 获取奖学金名额分配详细信息
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:query")
+ @GetMapping("/{id}")
+ public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+ return R.ok(scholarshipQuotaService.queryById(id));
+ }
+
+ /**
+ * 新增奖学金名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:add")
+ @Log(title = "新增奖学金名额分配", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping()
+ public R add(@Validated(AddGroup.class) @RequestBody JcbtScholarshipQuotaBo bo) {
+ return toAjax(scholarshipQuotaService.insertByBo(bo));
+ }
+
+ /**
+ * 修改奖学金名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:edit")
+ @Log(title = "修改奖学金名额分配", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping()
+ public R edit(@Validated(EditGroup.class) @RequestBody JcbtScholarshipQuotaBo bo) {
+ return toAjax(scholarshipQuotaService.updateByBo(bo));
+ }
+
+ /**
+ * 删除奖学金名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:remove")
+ @Log(title = "删除奖学金名额分配", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+ return toAjax(scholarshipQuotaService.deleteWithValidByIds(List.of(ids), true));
+ }
+
+ /**
+ * 批量删除奖学金名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:remove")
+ @Log(title = "批量删除奖学金名额分配", businessType = BusinessType.DELETE)
+ @DeleteMapping("/batch")
+ public R batchRemove(@RequestBody @NotEmpty(message = "主键不能为空") List ids) {
+ return toAjax(scholarshipQuotaService.deleteWithValidByIds(ids, true));
+ }
+
+ /**
+ * 清空指定批次和奖学金类型的名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:remove")
+ @Log(title = "清空奖学金名额分配", businessType = BusinessType.DELETE)
+ @DeleteMapping("/clear")
+ public R clearQuotaByBatchAndType(@RequestParam Long batchId,
+ @RequestParam(required = false) Long scholarshipTypeId) {
+ return toAjax(scholarshipQuotaService.clearQuotaByBatchAndType(batchId, scholarshipTypeId));
+ }
+
+ /**
+ * 批量分配名额
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:add")
+ @Log(title = "批量分配奖学金名额", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/batchAllocate")
+ public R batchAllocate(@RequestParam Long batchId,
+ @RequestParam Long scholarshipTypeId,
+ @RequestBody List quotaAllocations) {
+ return toAjax(scholarshipQuotaService.batchAllocateQuota(batchId, scholarshipTypeId, quotaAllocations));
+ }
+
+ /**
+ * 调整名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:edit")
+ @Log(title = "调整奖学金名额分配", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/adjust")
+ public R adjustQuota(@RequestParam Long fromQuotaId,
+ @RequestParam Long toQuotaId,
+ @RequestParam Integer adjustAmount,
+ @RequestParam String reason) {
+ return toAjax(scholarshipQuotaService.adjustQuotaAllocation(fromQuotaId, toQuotaId, adjustAmount, reason));
+ }
+
+ /**
+ * 锁定/解锁名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:edit")
+ @Log(title = "锁定/解锁奖学金名额分配", businessType = BusinessType.UPDATE)
+ @PutMapping("/lock/{id}")
+ public R lockQuota(@PathVariable Long id, @RequestParam Integer isLocked) {
+ return toAjax(scholarshipQuotaService.lockQuotaAllocation(id, isLocked));
+ }
+
+ /**
+ * 自动分配名额
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:edit")
+ @Log(title = "自动分配奖学金名额", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/autoAllocate")
+ public R autoAllocate(@RequestParam Long batchId,
+ @RequestParam Long scholarshipTypeId,
+ @RequestParam String allocationRule) {
+ return toAjax(scholarshipQuotaService.autoAllocateQuota(batchId, scholarshipTypeId, allocationRule));
+ }
+
+ /**
+ * 复制名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:add")
+ @Log(title = "复制奖学金名额分配", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/copy")
+ public R copyQuota(@RequestParam Long sourceBatchId,
+ @RequestParam Long targetBatchId,
+ @RequestBody List scholarshipTypeIds) {
+ return toAjax(scholarshipQuotaService.copyQuotaFromBatch(sourceBatchId, targetBatchId, scholarshipTypeIds));
+ }
+
+ /**
+ * 更新名额使用情况
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:edit")
+ @Log(title = "更新奖学金名额使用情况", businessType = BusinessType.UPDATE)
+ @PutMapping("/updateUsage/{id}")
+ public R updateUsage(@PathVariable Long id, @RequestParam Integer usedChange) {
+ return toAjax(scholarshipQuotaService.updateQuotaUsage(id, usedChange));
+ }
+
+ /**
+ * 验证名额分配
+ */
+ @SaCheckPermission("jcbt:scholarshipQuota:query")
+ @PostMapping("/validate")
+ public R validate(@RequestBody JcbtScholarshipQuotaBo bo) {
+ String validationMsg = scholarshipQuotaService.validateQuotaAllocation(bo);
+ return R.ok("验证结果", validationMsg);
+ }
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java
new file mode 100644
index 00000000..3db8ab2c
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java
@@ -0,0 +1,298 @@
+package org.dromara.jcbt.controller;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.jcbt.domain.vo.JcbtScholarshipTypeVo;
+import org.dromara.jcbt.domain.bo.JcbtScholarshipTypeBo;
+import org.dromara.jcbt.service.IJcbtScholarshipTypeService;
+import org.dromara.jcbt.service.IJcbtScholarshipCompatibilityService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.log.enums.BusinessType;
+
+/**
+ * 奖学金类型
+ *
+ * @author ruoyi
+ * @date 2025-01-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jcbt/scholarshipType")
+@Slf4j
+public class JcbtScholarshipTypeController extends BaseController {
+
+ private final IJcbtScholarshipTypeService scholarshipTypeService;
+ private final IJcbtScholarshipCompatibilityService compatibilityService;
+
+ /**
+ * 查询奖学金类型列表
+ */
+ @SaCheckPermission("jcbt:scholarshipType:list")
+ @GetMapping("/list")
+ public TableDataInfo list(JcbtScholarshipTypeBo bo, PageQuery pageQuery) {
+ return scholarshipTypeService.queryPageList(bo, pageQuery);
+ }
+
+ /**
+ * 导出奖学金类型列表
+ */
+ @SaCheckPermission("jcbt:scholarshipType:export")
+ @Log(title = "奖学金类型", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(JcbtScholarshipTypeBo bo, HttpServletResponse response) {
+ List list = scholarshipTypeService.queryExportList(bo);
+ ExcelUtil.exportExcel(list, "奖学金类型", JcbtScholarshipTypeVo.class, response);
+ }
+
+ /**
+ * 获取奖学金类型详细信息
+ */
+ @SaCheckPermission("jcbt:scholarshipType:query")
+ @GetMapping("/{id}")
+ public R getInfo(@NotNull(message = "主键不能为空")
+ @PathVariable Long id) {
+ return R.ok(scholarshipTypeService.queryById(id));
+ }
+
+ /**
+ * 新增奖学金类型
+ */
+ @SaCheckPermission("jcbt:scholarshipType:add")
+ @Log(title = "奖学金类型", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping()
+ public R add(@Validated(AddGroup.class) @RequestBody JcbtScholarshipTypeBo bo) {
+ return toAjax(scholarshipTypeService.insertByBo(bo));
+ }
+
+ /**
+ * 修改奖学金类型
+ */
+ @SaCheckPermission("jcbt:scholarshipType:edit")
+ @Log(title = "奖学金类型", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping()
+ public R edit(@Validated(EditGroup.class) @RequestBody JcbtScholarshipTypeBo bo) {
+ return toAjax(scholarshipTypeService.updateByBo(bo));
+ }
+
+ /**
+ * 删除奖学金类型
+ */
+ @SaCheckPermission("jcbt:scholarshipType:remove")
+ @Log(title = "奖学金类型", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@NotEmpty(message = "主键不能为空")
+ @PathVariable Long[] ids) {
+ return toAjax(scholarshipTypeService.deleteWithValidByIds(List.of(ids), true));
+ }
+
+ /**
+ * 根据类型名称查询奖学金类型
+ */
+ @SaCheckPermission("jcbt:scholarshipType:query")
+ @GetMapping("/getByName/{typeName}")
+ public R getByTypeName(@PathVariable String typeName) {
+ return R.ok(scholarshipTypeService.queryByTypeName(typeName));
+ }
+
+ /**
+ * 根据类别查询奖学金类型列表
+ */
+ @SaCheckPermission("jcbt:scholarshipType:query")
+ @GetMapping("/getByCategory/{typeCategory}")
+ public R> getByCategory(@PathVariable String typeCategory) {
+ return R.ok(scholarshipTypeService.queryByCategory(typeCategory));
+ }
+
+ /**
+ * 查询启用状态的奖学金类型列表
+ */
+ @SaCheckPermission("jcbt:scholarshipType:query")
+ @GetMapping("/getActiveTypes")
+ public R> getActiveTypes() {
+ return R.ok(scholarshipTypeService.queryActiveTypes());
+ }
+
+ /**
+ * 检查奖学金名称是否重复
+ */
+ @SaCheckPermission("jcbt:scholarshipType:query")
+ @GetMapping("/checkTypeNameUnique")
+ public R checkTypeNameUnique(@RequestParam String typeName,
+ @RequestParam(required = false) Long id) {
+ return R.ok(scholarshipTypeService.checkTypeNameUnique(typeName, id));
+ }
+
+ /**
+ * 批量更新排序号
+ */
+ @SaCheckPermission("jcbt:scholarshipType:edit")
+ @Log(title = "奖学金类型", businessType = BusinessType.UPDATE)
+ @PutMapping("/batchUpdateSort")
+ public R batchUpdateSortOrder(@RequestBody List scholarshipTypes) {
+ return toAjax(scholarshipTypeService.batchUpdateSortOrder(scholarshipTypes));
+ }
+
+ /**
+ * 根据兼得类型查询相关奖学金类型
+ */
+ @SaCheckPermission("jcbt:scholarshipType:query")
+ @GetMapping("/getByCompatibilityType/{compatibilityType}")
+ public R> getByCompatibilityType(@PathVariable String compatibilityType) {
+ return R.ok(scholarshipTypeService.queryByCompatibilityType(compatibilityType));
+ }
+
+ /**
+ * 启用/停用奖学金类型
+ */
+ @SaCheckPermission("jcbt:scholarshipType:edit")
+ @Log(title = "奖学金类型", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public R changeStatus(@RequestParam Long id, @RequestParam Integer status) {
+ return toAjax(scholarshipTypeService.changeStatus(id, status));
+ }
+
+ /**
+ * 获取奖学金类型选项列表
+ */
+ @SaCheckPermission("jcbt:scholarshipType:query")
+ @GetMapping("/options")
+ public R> getOptions() {
+ return R.ok(scholarshipTypeService.queryOptions());
+ }
+
+ /**
+ * 获取奖学金类型的兼得关系配置
+ */
+ @SaCheckPermission("jcbt:scholarshipType:compatibility")
+ @GetMapping("/{id}/compatibility")
+ public R> getCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+ // 获取所有启用的奖学金类型（除了当前奖学金）
+ List allTypes = scholarshipTypeService.queryActiveTypes()
+ .stream()
+ .filter(type -> !type.getId().equals(id))
+ .toList();
+
+ // 获取当前奖学金的互斥关系ID列表
+ List exclusiveTypeIds = compatibilityService.getExclusiveTypeIds(id);
+
+ // 获取当前奖学金的兼容关系ID列表
+ List compatibleTypeIds = compatibilityService.getCompatibleTypeIds(id);
+
+ // 获取互斥奖学金的详细信息（包含名称）
+ List exclusiveTypes = allTypes.stream()
+ .filter(type -> exclusiveTypeIds.contains(type.getId()))
+ .toList();
+
+ // 获取兼容奖学金的详细信息（包含名称）
+ List compatibleTypes = allTypes.stream()
+ .filter(type -> compatibleTypeIds.contains(type.getId()))
+ .toList();
+
+ Map result = new HashMap<>();
+ result.put("allTypes", allTypes);
+ result.put("exclusiveTypeIds", exclusiveTypeIds);
+ result.put("compatibleTypeIds", compatibleTypeIds);
+ // 新增：返回详细的兼容性信息
+ result.put("exclusiveTypes", exclusiveTypes);
+ result.put("compatibleTypes", compatibleTypes);
+
+ return R.ok(result);
+ }
+
+ /**
+ * 保存奖学金类型的兼得关系配置
+ */
+ @SaCheckPermission("jcbt:scholarshipType:compatibility")
+ @Log(title = "奖学金兼得关系配置", businessType = BusinessType.UPDATE)
+ @PostMapping("/{id}/compatibility")
+ public R saveCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id,
+ @RequestBody Map config) {
+ // 安全地转换互斥类型ID列表，支持前端传递的字符串或数字类型
+ @SuppressWarnings("unchecked")
+ List