From a2222f63cb61abd7630f2197bdfafff7ddb22383 Mon Sep 17 00:00:00 2001
From: wuzhen <52326163@qq.com>
Date: Sun, 10 Aug 2025 00:24:31 +0800
Subject: [PATCH] wuzhen update
---
backend/add_create_dept.sql | 1 +
backend/add_create_dept_field.sql | 6 +
backend/debug_compatibility_type.sql | 30 +
backend/fix_compatibility_create_dept.sql | 36 +
...bt_scholarship_application_create_dept.sql | 33 +
backend/quota_diagnosis_results.txt | 37 +
backend/ruoyi-admin/pom.xml | 7 +
.../src/main/resources/application-dev.yml | 30 +
.../src/main/resources/application-prod.yml | 2 +-
backend/ruoyi-modules/pom.xml | 1 +
.../impl/CwApprovalRecordServiceImpl.java | 99 +-
.../impl/CwProjectApplicationServiceImpl.java | 20 +-
backend/ruoyi-modules/ruoyi-jcbt/pom.xml | 115 ++
.../dromara/jcbt/RuoyiJcbtApplication.java | 19 +
.../java/org/dromara/jcbt/controller/.gitkeep | 0
.../JcbtPovertyApplicationController.java | 317 ++++
.../JcbtScholarshipApplicationController.java | 417 +++++
.../JcbtScholarshipBatchController.java | 180 ++
.../JcbtScholarshipQuotaController.java | 248 +++
.../JcbtScholarshipReviewController.java | 263 +++
.../JcbtScholarshipTypeController.java | 298 ++++
.../jcbt/domain/JcbtAssistanceType.java | 66 +
.../jcbt/domain/JcbtPovertyApplication.java | 201 +++
.../jcbt/domain/JcbtRecognitionType.java | 71 +
.../domain/JcbtScholarshipApplication.java | 160 ++
.../domain/JcbtScholarshipAttachment.java | 131 ++
.../jcbt/domain/JcbtScholarshipBatch.java | 118 ++
.../jcbt/domain/JcbtScholarshipBatchType.java | 58 +
.../domain/JcbtScholarshipClassQuota.java | 111 ++
.../domain/JcbtScholarshipCompatibility.java | 68 +
.../jcbt/domain/JcbtScholarshipQuota.java | 125 ++
.../domain/JcbtScholarshipQuotaUsage.java | 107 ++
.../jcbt/domain/JcbtScholarshipReview.java | 95 ++
.../jcbt/domain/JcbtScholarshipType.java | 110 ++
.../java/org/dromara/jcbt/domain/bo/.gitkeep | 0
.../jcbt/domain/bo/AuditRequestBo.java | 28 +
.../domain/bo/JcbtPovertyApplicationBo.java | 238 +++
.../bo/JcbtScholarshipApplicationBo.java | 232 +++
.../domain/bo/JcbtScholarshipBatchBo.java | 126 ++
.../bo/JcbtScholarshipClassQuotaBo.java | 112 ++
.../bo/JcbtScholarshipCompatibilityBo.java | 68 +
.../domain/bo/JcbtScholarshipQuotaBo.java | 123 ++
.../domain/bo/JcbtScholarshipReviewBo.java | 101 ++
.../jcbt/domain/bo/JcbtScholarshipTypeBo.java | 113 ++
.../org/dromara/jcbt/domain/entity/.gitkeep | 0
.../java/org/dromara/jcbt/domain/vo/.gitkeep | 0
.../domain/vo/JcbtPovertyApplicationVo.java | 245 +++
.../vo/JcbtScholarshipApplicationVo.java | 192 +++
.../vo/JcbtScholarshipAttachmentVo.java | 123 ++
.../domain/vo/JcbtScholarshipBatchVo.java | 162 ++
.../vo/JcbtScholarshipClassQuotaVo.java | 117 ++
.../vo/JcbtScholarshipCompatibilityVo.java | 99 ++
.../domain/vo/JcbtScholarshipQuotaVo.java | 224 +++
.../domain/vo/JcbtScholarshipReviewVo.java | 162 ++
.../jcbt/domain/vo/JcbtScholarshipTypeVo.java | 147 ++
.../jcbt/enums/ApplicationStatusEnum.java | 111 ++
.../main/java/org/dromara/jcbt/event/.gitkeep | 0
.../java/org/dromara/jcbt/listener/.gitkeep | 0
.../java/org/dromara/jcbt/mapper/.gitkeep | 0
.../mapper/JcbtPovertyApplicationMapper.java | 91 +
.../JcbtScholarshipApplicationMapper.java | 99 ++
.../mapper/JcbtScholarshipBatchMapper.java | 15 +
.../JcbtScholarshipBatchTypeMapper.java | 14 +
.../JcbtScholarshipClassQuotaMapper.java | 66 +
.../JcbtScholarshipCompatibilityMapper.java | 42 +
.../mapper/JcbtScholarshipQuotaMapper.java | 118 ++
.../mapper/JcbtScholarshipReviewMapper.java | 85 +
.../mapper/JcbtScholarshipTypeMapper.java | 73 +
.../java/org/dromara/jcbt/service/.gitkeep | 0
.../IJcbtPovertyApplicationService.java | 181 ++
.../IJcbtScholarshipApplicationService.java | 239 +++
.../service/IJcbtScholarshipBatchService.java | 89 +
.../IJcbtScholarshipBatchTypeService.java | 41 +
.../IJcbtScholarshipClassQuotaService.java | 116 ++
.../IJcbtScholarshipCompatibilityService.java | 100 ++
.../service/IJcbtScholarshipQuotaService.java | 190 +++
.../IJcbtScholarshipReviewService.java | 135 ++
.../service/IJcbtScholarshipTypeService.java | 94 ++
.../org/dromara/jcbt/service/impl/.gitkeep | 0
.../JcbtPovertyApplicationServiceImpl.java | 465 ++++++
...JcbtScholarshipApplicationServiceImpl.java | 1160 +++++++++++++
.../impl/JcbtScholarshipBatchServiceImpl.java | 295 ++++
.../JcbtScholarshipBatchTypeServiceImpl.java | 89 +
.../JcbtScholarshipClassQuotaServiceImpl.java | 159 ++
...btScholarshipCompatibilityServiceImpl.java | 220 +++
.../impl/JcbtScholarshipQuotaServiceImpl.java | 515 ++++++
.../JcbtScholarshipReviewServiceImpl.java | 520 ++++++
.../impl/JcbtScholarshipTypeServiceImpl.java | 234 +++
.../src/main/resources/application.yml | 36 +
.../src/main/resources/mapper/.gitkeep | 0
.../mapper/JcbtScholarshipQuotaMapper.xml | 316 ++++
.../jcbt/JcbtPovertyApplicationMapper.xml | 246 +++
.../jcbt/JcbtScholarshipApplicationMapper.xml | 167 ++
.../jcbt/JcbtScholarshipClassQuotaMapper.xml | 91 +
.../JcbtScholarshipCompatibilityMapper.xml | 50 +
.../jcbt/JcbtScholarshipReviewMapper.xml | 191 +++
.../mapper/jcbt/JcbtScholarshipTypeMapper.xml | 89 +
.../scholarship-review-menu-permissions.sql | 75 +
...add_missing_fields_to_scholarship_type.sql | 28 +
backend/sql/debug_quota_delete_issue.sql | 134 ++
backend/sql/diagnose_quota_display_issue.sql | 249 +++
.../diagnose_quota_display_issue_correct.sql | 245 +++
...diagnose_quota_display_issue_corrected.sql | 353 ++++
.../diagnose_quota_display_issue_final.sql | 306 ++++
backend/sql/fix_compatibility_type_field.sql | 56 +
backend/sql/fix_quota_unique_constraint.sql | 101 ++
backend/sql/insert_test_data_simple.sql | 71 +
backend/sql/jcbt_poverty_application_menu.sql | 119 ++
.../sql/jcbt_poverty_application_table.sql | 311 ++++
...holarship_application_menu_permissions.sql | 141 ++
backend/sql/jcbt_scholarship_management.sql | 42 +
.../sql/jcbt_scholarship_quota_management.sql | 98 ++
...cbt_scholarship_quota_menu_permissions.sql | 134 ++
backend/sql/scholarship_test_data.sql | 224 +++
backend/sql/test_missing_fields_fix.sql | 105 ++
backend/sql/test_scholarship_basic_data.sql | 131 ++
.../batch-type-association-2025-01-27.md | 133 ++
.../code-adjust-record-2024-12-19-cursor.md | 231 +++
...code-adjust-record-2025-01-01-assistant.md | 68 +
.../code-adjust-record-2025-01-01-wuzhen.md | 165 ++
.../code-adjust-record-2025-01-07-cursor.md | 186 +++
.../code-adjust-record-2025-01-07-wuzhen.md | 216 +++
.../code-adjust-record-2025-01-18-wuzhen.md | 443 ++++-
...ord-2025-01-26-cursor-form-improvements.md | 1 +
...d-2025-01-26-cursor-poverty-class-first.md | 1 +
...ord-2025-01-26-cursor-poverty-index-fix.md | 1 +
.../code-adjust-record-2025-01-26-cursor.md | 1 +
...ecord-2025-01-26-奖学金申请列表显示修复.md | 210 +++
...code-adjust-record-2025-01-27-assistant.md | 147 +-
...just-record-2025-01-27-batch-management.md | 240 +++
.../code-adjust-record-2025-01-27-cursor.md | 128 ++
...cord-2025-01-27-fix-batch-apply-display.md | 140 ++
...025-01-27-fix-quota-batch-type-relation.md | 244 +++
...just-record-2025-01-27-fix-quota-fields.md | 220 +++
...adjust-record-2025-01-27-frontend-batch.md | 247 +++
.../code-adjust-record-2025-01-27-frontend.md | 253 +++
...rd-2025-01-27-hide-auto-allocate-button.md | 113 ++
...e-adjust-record-2025-01-27-quota-module.md | 300 ++++
...rd-2025-01-27-scholarship-compatibility.md | 193 +++
...cholarship-quota-display-implementation.md | 413 +++++
...rd-2025-01-27-scholarship-quota-display.md | 245 +++
...ode-adjust-record-2025-01-27-statistics.md | 110 +-
.../code-adjust-record-2025-01-27-system.md | 183 ++
...adjust-record-2025-01-27-ui-enhancement.md | 219 +++
.../code-adjust-record-2025-01-27-wuzhen.md | 609 ++++++-
...rd-2025-01-28-fix-scholarship-quota-log.md | 1 +
.../code-adjust-record-2025-01-28-wuzhen.md | 37 +
...st-record-2025-08-04-missing-fields-fix.md | 286 ++++
...4-scholarship-compatibility-display-fix.md | 514 ++++++
...djust-record-2025-08-05-API对接准备就绪.md | 186 +++
...d-2025-08-05-scholarship-add-button-fix.md | 214 +++
...-08-05-scholarship-application-redesign.md | 205 +++
...-08-05-scholarship-batch-apply-redesign.md | 347 ++++
...-2025-08-05-scholarship-edit-button-fix.md | 121 ++
...-record-2025-08-05-scholarship-edit-fix.md | 156 ++
...d-2025-08-05-scholarship-quota-frontend.md | 266 +++
.../code-adjust-record-2025-08-05-wuzhen.md | 170 ++
...st-record-2025-08-05-奖学金申请重构完成.md | 229 +++
...ecord-2025-08-05-奖学金申请重构状态总结.md | 174 ++
...adjust-record-2025-08-06-fix-class-info.md | 187 +++
...record-2025-08-06-fix-scholarship-types.md | 154 ++
.../code-adjust-record-2025-08-07-wuzhen.md | 92 +
.../code-adjust-record-2025-08-08-wuzhen.md | 112 ++
...larship-database-model-check-2025-08-05.md | 182 ++
.../API/后端API数据格式示例-班级名额显示.md | 259 +++
docs/开发文档/API/奖学金名额分配管理API.md | 570 +++++++
docs/开发文档/API/奖学金申请管理API.md | 738 +++++++++
docs/开发文档/SQL调试日志使用说明.md | 200 +++
docs/开发文档/前后端接口一致性规范.md | 316 ++++
.../奖学金申请列表显示问题排查手册.md | 241 +++
.../database/奖学金v2.0数据字典配置.sql | 75 +
.../database/奖学金申请列表数据修复脚本.sql | 64 +
.../database/奖学金申请数据检查脚本.sql | 70 +
...学金申请管理v2.0数据库升级脚本-修复版.sql | 423 +++++
.../奖学金申请管理v2.0数据库升级脚本.sql | 273 +++
docs/调试日志/奖学金审核问题调试指南.md | 169 ++
docs/需求文档/奖惩补贴需求/README.md | 369 +++++
.../奖惩补贴需求/助学金管理原始需求.md | 37 +
.../奖学金申请管理v2.0重构总结.md | 390 +++++
.../奖学金申请管理模块需求设计v2.0.md | 687 ++++++++
.../奖学金管理基础数据-兼得关系增强-增量.sql | 138 ++
...奖学金管理基础数据-兼得关系增强-安全版.sql | 107 ++
.../奖学金管理基础数据-兼得关系增强.sql | 134 ++
.../奖惩补贴需求/奖学金管理基础数据.sql | 212 +++
.../奖惩补贴需求/奖学金管理建表脚本.sql | 366 ++++
.../奖惩补贴需求/奖学金管理数据模型设计.md | 581 +++++++
.../奖学金管理模块产品需求设计.md | 573 +++++++
docs/需求文档/奖惩补贴需求/用户原始需求.md | 23 +
...bt_scholarship_application_create_dept.sql | 33 +
permission-debug.html | 318 ++++
stgl-api-test.js | 550 ------
test_class_api.html | 364 ++++
test_scholarship_review_page.md | 120 ++
web/src/api/cw/approvalRecord.ts | 4 +-
web/src/api/cw/financeApproval.ts | 10 +-
web/src/api/cw/leaderApproval.ts | 4 +-
web/src/api/cw/projectApplication.ts | 4 +-
web/src/api/cw/statistics.ts | 16 +-
web/src/api/jcbt/index.ts | 171 ++
web/src/api/jcbt/povertyApplication.ts | 426 +++++
web/src/api/jcbt/scholarship/review.ts | 30 +
web/src/api/jcbt/scholarshipApplication.ts | 221 +++
web/src/api/jcbt/scholarshipBatch.ts | 226 +++
web/src/api/jcbt/scholarshipQuota.ts | 217 +++
web/src/api/jcbt/scholarshipReview.ts | 223 +++
web/src/api/jcbt/scholarshipType.ts | 331 ++++
web/src/api/jcbt/types.ts | 503 ++++++
web/src/api/system/SysRegion/types.ts | 14 +-
web/src/api/system/bucketPassword.ts | 50 +-
web/src/api/system/file.ts | 56 +-
.../studentLeave/studentLeave/types.ts | 14 +-
web/src/api/xg-xx-bak/classInfo.ts | 128 +-
web/src/api/xg-xx-bak/statistics.ts | 252 +--
web/src/api/xg-xx-bak/student.ts | 328 ++--
web/src/api/xg-xx-bak/types.ts | 1060 ++++++------
web/src/api/xg/classTeacherCounselorRel.ts | 2 +-
web/src/api/xg/index.ts | 2 +-
web/src/api/xg/xgss/dormBed/types.ts | 3 -
web/src/api/xg/xgss/dormRoom/types.ts | 14 +-
.../xgss/glysqgx/dormManagerSource/types.ts | 14 +-
.../glysslqxgx/dormManagerBuilding/types.ts | 14 +-
.../api/xg/xgss/ssglyxx/dormManager/types.ts | 14 +-
.../api/xg/xgss/sslxx/dormBuilding/types.ts | 6 +-
web/src/api/xg/xgss/ssqxx/dormArea/types.ts | 14 +-
web/src/api/xg/xgss/xqxx/dormCampus/types.ts | 14 +-
web/src/api/xg/xgss/xsssfjgl/index.ts | 4 +-
.../xsjcxx/XgStuColBatch/stuColBatch/types.ts | 14 +-
.../api/xg/xsjcxx/classMsg/classMsg/types.ts | 14 +-
.../stuColBatchClass/types.ts | 14 +-
web/src/api/xg/xsjcxx/stuMsgAudit/types.ts | 14 +-
web/src/api/xg/xsjcxx/stuMsgSupply/types.ts | 14 +-
web/src/api/xg/xsjcxx/studentMsg/index.ts | 28 +-
.../xg/xsjcxx/studentMsg/studentMsg/types.ts | 26 +-
.../studentMsgBatch/studentMsgBatch/types.ts | 26 +-
.../xgClassPosDict/xgClassPosDict/types.ts | 14 +-
.../xgClassPosMsg/xgClassPosMsg/types.ts | 14 +-
.../xgLeaveTypeConfig/types.ts | 14 +-
.../xgStudentManager/studentManager/types.ts | 14 +-
.../studentManagerSource/index.ts | 6 +-
.../studentManagerSource/types.ts | 14 +-
web/src/api/xljk/consultation/appointment.ts | 1 -
web/src/api/xljk/consultation/index.ts | 10 +-
web/src/api/xljk/consultation/noshow.ts | 6 +-
web/src/api/xljk/consultation/types.ts | 8 +-
web/src/api/xljk/evaluation/index.ts | 10 +-
web/src/api/xljk/evaluation/types.ts | 2 +-
web/src/api/zsjy/README.md | 1 +
web/src/api/zsjy/enrollment/index.ts | 4 +-
web/src/api/zsjy/enrollmentProcess.ts | 254 ++-
web/src/api/zsjy/enrollmentStatistics.ts | 28 +-
web/src/api/zsjy/graduateInfo.ts | 7 +-
web/src/api/zsjy/index.ts | 10 +-
web/src/api/zsjy/jobPosition.ts | 22 +-
web/src/api/zsjy/recruitmentPoster.ts | 22 +-
web/src/api/zsjy/statistics.ts | 22 +-
web/src/assets/styles/index.scss | 3 +-
web/src/components/ImageUpload/index-bak.vue | 2 -
web/src/components/PosterPreview/index.vue | 189 +--
web/src/plugins/download.ts | 6 +-
web/src/plugins/svgicon.ts | 10 +-
web/src/router/index.ts | 2 +-
web/src/types/global.d.ts | 4 +-
web/src/utils/request.ts | 6 +-
.../components/PerformanceIndicators.vue | 377 ++---
web/src/views/cw/application/detail.vue | 210 ++-
web/src/views/cw/application/form.vue | 667 ++++----
web/src/views/cw/application/index.vue | 472 +++---
web/src/views/cw/application/summary.vue | 27 +-
web/src/views/cw/approvalRecord/index.vue | 143 +-
web/src/views/cw/approverConfig/detail.vue | 82 +-
web/src/views/cw/approverConfig/index.vue | 298 ++--
web/src/views/cw/statistics/index.vue | 5 +-
.../views/jcbt/poverty/Application/form.vue | 672 ++++++++
.../views/jcbt/poverty/Application/index.vue | 1475 +++++++++++++++++
.../jcbt/scholarship/application/detail.vue | 488 ++++++
.../jcbt/scholarship/application/form.vue | 720 ++++++++
.../jcbt/scholarship/application/index.vue | 1317 +++++++++++++++
.../views/jcbt/scholarship/batch/index.vue | 983 +++++++++++
.../views/jcbt/scholarship/quota/index.vue | 1370 +++++++++++++++
.../review/components/ReviewActionDialog.vue | 314 ++++
.../views/jcbt/scholarship/review/history.vue | 581 +++++++
.../views/jcbt/scholarship/review/index.vue | 1068 ++++++++++++
.../views/jcbt/scholarship/review/myTasks.vue | 781 +++++++++
web/src/views/jcbt/scholarship/type/index.vue | 1258 ++++++++++++++
284 files changed, 48629 insertions(+), 3473 deletions(-)
create mode 100644 backend/add_create_dept.sql
create mode 100644 backend/add_create_dept_field.sql
create mode 100644 backend/debug_compatibility_type.sql
create mode 100644 backend/fix_compatibility_create_dept.sql
create mode 100644 backend/fix_jcbt_scholarship_application_create_dept.sql
create mode 100644 backend/quota_diagnosis_results.txt
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/pom.xml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/RuoyiJcbtApplication.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtAssistanceType.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtPovertyApplication.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtRecognitionType.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipApplication.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipAttachment.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipBatch.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipBatchType.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipClassQuota.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipCompatibility.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipQuota.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipQuotaUsage.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipReview.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/JcbtScholarshipType.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/AuditRequestBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtPovertyApplicationBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtScholarshipApplicationBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtScholarshipBatchBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtScholarshipClassQuotaBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtScholarshipCompatibilityBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtScholarshipQuotaBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtScholarshipReviewBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/bo/JcbtScholarshipTypeBo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/entity/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtPovertyApplicationVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipApplicationVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipAttachmentVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipBatchVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipClassQuotaVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipCompatibilityVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipQuotaVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipReviewVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/domain/vo/JcbtScholarshipTypeVo.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/enums/ApplicationStatusEnum.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/event/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/listener/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtPovertyApplicationMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipApplicationMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipBatchMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipBatchTypeMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipClassQuotaMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipCompatibilityMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipQuotaMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipReviewMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/mapper/JcbtScholarshipTypeMapper.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtPovertyApplicationService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipApplicationService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipBatchService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipBatchTypeService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipClassQuotaService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipCompatibilityService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipQuotaService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipReviewService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/IJcbtScholarshipTypeService.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtPovertyApplicationServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipBatchServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipBatchTypeServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipClassQuotaServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipCompatibilityServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipQuotaServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipReviewServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipTypeServiceImpl.java
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/application.yml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/.gitkeep
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/JcbtScholarshipQuotaMapper.xml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/jcbt/JcbtPovertyApplicationMapper.xml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/jcbt/JcbtScholarshipApplicationMapper.xml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/jcbt/JcbtScholarshipClassQuotaMapper.xml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/jcbt/JcbtScholarshipCompatibilityMapper.xml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/jcbt/JcbtScholarshipReviewMapper.xml
create mode 100644 backend/ruoyi-modules/ruoyi-jcbt/src/main/resources/mapper/jcbt/JcbtScholarshipTypeMapper.xml
create mode 100644 backend/script/sql/scholarship-review-menu-permissions.sql
create mode 100644 backend/sql/add_missing_fields_to_scholarship_type.sql
create mode 100644 backend/sql/debug_quota_delete_issue.sql
create mode 100644 backend/sql/diagnose_quota_display_issue.sql
create mode 100644 backend/sql/diagnose_quota_display_issue_correct.sql
create mode 100644 backend/sql/diagnose_quota_display_issue_corrected.sql
create mode 100644 backend/sql/diagnose_quota_display_issue_final.sql
create mode 100644 backend/sql/fix_compatibility_type_field.sql
create mode 100644 backend/sql/fix_quota_unique_constraint.sql
create mode 100644 backend/sql/insert_test_data_simple.sql
create mode 100644 backend/sql/jcbt_poverty_application_menu.sql
create mode 100644 backend/sql/jcbt_poverty_application_table.sql
create mode 100644 backend/sql/jcbt_scholarship_application_menu_permissions.sql
create mode 100644 backend/sql/jcbt_scholarship_management.sql
create mode 100644 backend/sql/jcbt_scholarship_quota_management.sql
create mode 100644 backend/sql/jcbt_scholarship_quota_menu_permissions.sql
create mode 100644 backend/sql/scholarship_test_data.sql
create mode 100644 backend/sql/test_missing_fields_fix.sql
create mode 100644 backend/sql/test_scholarship_basic_data.sql
create mode 100644 docs/变更管理/batch-type-association-2025-01-27.md
create mode 100644 docs/变更管理/code-adjust-record-2024-12-19-cursor.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-01-assistant.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-01-wuzhen.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-07-cursor.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-07-wuzhen.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-26-cursor-form-improvements.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-26-cursor-poverty-class-first.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-26-cursor-poverty-index-fix.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-26-cursor.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-26-奖学金申请列表显示修复.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-batch-management.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-fix-batch-apply-display.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-fix-quota-batch-type-relation.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-fix-quota-fields.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-frontend-batch.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-frontend.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-hide-auto-allocate-button.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-quota-module.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-scholarship-compatibility.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-scholarship-quota-display-implementation.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-scholarship-quota-display.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-system.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-27-ui-enhancement.md
create mode 100644 docs/变更管理/code-adjust-record-2025-01-28-fix-scholarship-quota-log.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-04-missing-fields-fix.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-04-scholarship-compatibility-display-fix.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-API对接准备就绪.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-scholarship-add-button-fix.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-scholarship-application-redesign.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-scholarship-batch-apply-redesign.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-scholarship-edit-button-fix.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-scholarship-edit-fix.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-scholarship-quota-frontend.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-wuzhen.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-奖学金申请重构完成.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-05-奖学金申请重构状态总结.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-06-fix-class-info.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-06-fix-scholarship-types.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-07-wuzhen.md
create mode 100644 docs/变更管理/code-adjust-record-2025-08-08-wuzhen.md
create mode 100644 docs/变更管理/scholarship-database-model-check-2025-08-05.md
create mode 100644 docs/开发文档/API/后端API数据格式示例-班级名额显示.md
create mode 100644 docs/开发文档/API/奖学金名额分配管理API.md
create mode 100644 docs/开发文档/API/奖学金申请管理API.md
create mode 100644 docs/开发文档/SQL调试日志使用说明.md
create mode 100644 docs/开发文档/前后端接口一致性规范.md
create mode 100644 docs/故障排查/奖学金申请列表显示问题排查手册.md
create mode 100644 docs/设计文档/database/奖学金v2.0数据字典配置.sql
create mode 100644 docs/设计文档/database/奖学金申请列表数据修复脚本.sql
create mode 100644 docs/设计文档/database/奖学金申请数据检查脚本.sql
create mode 100644 docs/设计文档/database/奖学金申请管理v2.0数据库升级脚本-修复版.sql
create mode 100644 docs/设计文档/database/奖学金申请管理v2.0数据库升级脚本.sql
create mode 100644 docs/调试日志/奖学金审核问题调试指南.md
create mode 100644 docs/需求文档/奖惩补贴需求/README.md
create mode 100644 docs/需求文档/奖惩补贴需求/助学金管理原始需求.md
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金申请管理v2.0重构总结.md
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金申请管理模块需求设计v2.0.md
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金管理基础数据-兼得关系增强-增量.sql
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金管理基础数据-兼得关系增强-安全版.sql
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金管理基础数据-兼得关系增强.sql
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金管理基础数据.sql
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金管理建表脚本.sql
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金管理数据模型设计.md
create mode 100644 docs/需求文档/奖惩补贴需求/奖学金管理模块产品需求设计.md
create mode 100644 docs/需求文档/奖惩补贴需求/用户原始需求.md
create mode 100644 fix_jcbt_scholarship_application_create_dept.sql
create mode 100644 permission-debug.html
delete mode 100644 stgl-api-test.js
create mode 100644 test_class_api.html
create mode 100644 test_scholarship_review_page.md
create mode 100644 web/src/api/jcbt/index.ts
create mode 100644 web/src/api/jcbt/povertyApplication.ts
create mode 100644 web/src/api/jcbt/scholarship/review.ts
create mode 100644 web/src/api/jcbt/scholarshipApplication.ts
create mode 100644 web/src/api/jcbt/scholarshipBatch.ts
create mode 100644 web/src/api/jcbt/scholarshipQuota.ts
create mode 100644 web/src/api/jcbt/scholarshipReview.ts
create mode 100644 web/src/api/jcbt/scholarshipType.ts
create mode 100644 web/src/api/jcbt/types.ts
create mode 100644 web/src/views/jcbt/poverty/Application/form.vue
create mode 100644 web/src/views/jcbt/poverty/Application/index.vue
create mode 100644 web/src/views/jcbt/scholarship/application/detail.vue
create mode 100644 web/src/views/jcbt/scholarship/application/form.vue
create mode 100644 web/src/views/jcbt/scholarship/application/index.vue
create mode 100644 web/src/views/jcbt/scholarship/batch/index.vue
create mode 100644 web/src/views/jcbt/scholarship/quota/index.vue
create mode 100644 web/src/views/jcbt/scholarship/review/components/ReviewActionDialog.vue
create mode 100644 web/src/views/jcbt/scholarship/review/history.vue
create mode 100644 web/src/views/jcbt/scholarship/review/index.vue
create mode 100644 web/src/views/jcbt/scholarship/review/myTasks.vue
create mode 100644 web/src/views/jcbt/scholarship/type/index.vue
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/add_create_dept_field.sql b/backend/add_create_dept_field.sql
new file mode 100644
index 00000000..18067ae6
--- /dev/null
+++ b/backend/add_create_dept_field.sql
@@ -0,0 +1,6 @@
+-- 为 jcbt_scholarship_application 表添加 create_dept 字段
+-- 解决 MyBatis-Plus 插入数据时的字段缺失问题
+
+ALTER TABLE jcbt_scholarship_application
+ADD COLUMN create_dept bigint(20) DEFAULT NULL COMMENT '创建部门'
+AFTER submit_time;
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/fix_jcbt_scholarship_application_create_dept.sql b/backend/fix_jcbt_scholarship_application_create_dept.sql
new file mode 100644
index 00000000..b4ff35ab
--- /dev/null
+++ b/backend/fix_jcbt_scholarship_application_create_dept.sql
@@ -0,0 +1,33 @@
+-- 修复奖学金申请表缺失的create_dept字段
+-- 问题: MyBatis-Plus插入数据时报错 Unknown column 'create_dept' in 'field list'
+-- 原因: 数据库表缺少BaseEntity中的create_dept字段
+-- 解决方案: 为jcbt_scholarship_application表添加create_dept字段
+
+-- 检查字段是否存在，不存在则添加
+SET @sql = '';
+SELECT COUNT(*) INTO @col_exists
+FROM information_schema.columns
+WHERE table_schema = 'hzdyjs_xg'
+ AND table_name = 'jcbt_scholarship_application'
+ AND column_name = 'create_dept';
+
+-- 如果字段不存在，则添加
+SET @sql = IF(@col_exists = 0,
+ 'ALTER TABLE jcbt_scholarship_application ADD COLUMN create_dept bigint(20) DEFAULT NULL COMMENT ''创建部门'' AFTER submit_time;',
+ 'SELECT ''字段 create_dept 已存在，跳过添加'' AS message;');
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 验证字段是否添加成功
+SELECT
+ COLUMN_NAME as '字段名',
+ DATA_TYPE as '数据类型',
+ IS_NULLABLE as '允许空值',
+ COLUMN_DEFAULT as '默认值',
+ COLUMN_COMMENT as '注释'
+FROM information_schema.columns
+WHERE table_schema = 'hzdyjs_xg'
+ AND table_name = 'jcbt_scholarship_application'
+ AND column_name = 'create_dept';
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-admin/pom.xml b/backend/ruoyi-admin/pom.xml
index f812e856..4e1232c7 100644
--- a/backend/ruoyi-admin/pom.xml
+++ b/backend/ruoyi-admin/pom.xml
@@ -135,6 +135,13 @@
${revision}
+
+
+ org.dromara
+ ruoyi-jcbt
+ ${revision}
+
+
diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
index de9c9704..f522adfd 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
@@ -36,6 +36,8 @@ import org.dromara.system.domain.bo.SysDeptBo;
import java.util.*;
import java.util.stream.Collectors;
import org.dromara.common.core.utils.SpringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
/**
* 审批记录Service业务层处理
@@ -54,6 +56,9 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
private final ISysUserService sysUserService;
private final ISysDeptService sysDeptService;
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
/**
* 根据主键查询审批记录
*/
@@ -1119,51 +1124,91 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
return checkApprovalPermission(applicationId, "dept_approve");
}
- /**
+ /**
* 获取可选审批人列表（院领导）
+ * 修改为基于权限角色查找：查找具有cw:approval:leader权限的用户
*/
@Override
public List> getAvailableApprovers(Long applicationId) {
- log.info("开始查询院领导审批人列表，applicationId: {}", applicationId);
+ log.info("开始查询院领导审批人列表（基于权限角色），applicationId: {}", applicationId);
List> approvers = new ArrayList<>();
try {
- // 1. 查询部门名称包含"院领导"的部门
- SysDeptBo deptBo = new SysDeptBo();
- deptBo.setDeptName("院领导"); // 设置查询条件
- List leaderDepts = sysDeptService.selectDeptList(deptBo);
+ // 使用原生SQL查询具有cw:approval:leader权限的用户
+ String sql = """
+ SELECT DISTINCT
+ u.user_id,
+ u.user_name,
+ u.nick_name,
+ COALESCE(d.dept_name, '未分配部门') as dept_name,
+ COALESCE(d.dept_id, 0) as dept_id
+ FROM sys_user u
+ LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
+ INNER JOIN sys_user_role ur ON u.user_id = ur.user_id
+ INNER JOIN sys_role r ON ur.role_id = r.role_id
+ INNER JOIN sys_role_menu rm ON r.role_id = rm.role_id
+ INNER JOIN sys_menu m ON rm.menu_id = m.menu_id
+ WHERE m.perms = 'cw:approval:leader'
+ AND u.status = '0'
+ AND u.del_flag = '0'
+ AND r.status = '0'
+ ORDER BY u.user_name
+ """;
- log.info("找到院领导部门数量: {}", leaderDepts.size());
- for (SysDeptVo dept : leaderDepts) {
- log.info("院领导部门: ID={}, 名称={}", dept.getDeptId(), dept.getDeptName());
+ log.info("执行权限查询SQL查找具有cw:approval:leader权限的用户");
+
+ // 执行SQL查询
+ List> results = jdbcTemplate.queryForList(sql);
+
+ log.info("SQL查询结果：找到 {} 个具有院领导审批权限的用户", results.size());
+
+ // 转换查询结果为返回格式
+ for (Map row : results) {
+ Map approver = new HashMap<>();
+ approver.put("userId", row.get("user_id"));
+ approver.put("userName", row.get("user_name"));
+ approver.put("nickName", row.get("nick_name"));
+ approver.put("deptName", row.get("dept_name"));
+ approver.put("deptId", row.get("dept_id"));
+ approvers.add(approver);
+
+ log.info("添加院领导审批人: userId={}, userName={}, nickName={}, deptName={}",
+ row.get("user_id"), row.get("user_name"), row.get("nick_name"), row.get("dept_name"));
}
- // 2. 查询院领导部门下的所有用户
- for (SysDeptVo dept : leaderDepts) {
- List users = sysUserService.selectUserListByDept(dept.getDeptId());
+ // 如果基于权限查询没有找到用户，使用原有的部门查询作为备选方案
+ if (approvers.isEmpty()) {
+ log.warn("基于权限查询未找到院领导，尝试使用部门查询作为备选方案");
- log.info("部门[{}]下的用户数量: {}", dept.getDeptName(), users.size());
+ SysDeptBo deptBo = new SysDeptBo();
+ deptBo.setDeptName("院领导");
+ List leaderDepts = sysDeptService.selectDeptList(deptBo);
- // 3. 将用户信息转换为Map格式
- for (SysUserVo user : users) {
- // 只返回状态正常的用户
- if ("0".equals(user.getStatus())) {
- Map approver = new HashMap<>();
- approver.put("userId", user.getUserId());
- approver.put("userName", user.getUserName());
- approver.put("nickName", user.getNickName());
- approver.put("deptName", dept.getDeptName());
- approver.put("deptId", dept.getDeptId());
- approvers.add(approver);
+ log.info("备选方案：找到院领导部门数量: {}", leaderDepts.size());
- log.info("添加院领导审批人: userId={}, userName={}, nickName={}",
- user.getUserId(), user.getUserName(), user.getNickName());
+ for (SysDeptVo dept : leaderDepts) {
+ List users = sysUserService.selectUserListByDept(dept.getDeptId());
+ log.info("备选方案：部门[{}]下的用户数量: {}", dept.getDeptName(), users.size());
+
+ for (SysUserVo user : users) {
+ if ("0".equals(user.getStatus())) {
+ Map approver = new HashMap<>();
+ approver.put("userId", user.getUserId());
+ approver.put("userName", user.getUserName());
+ approver.put("nickName", user.getNickName());
+ approver.put("deptName", dept.getDeptName());
+ approver.put("deptId", dept.getDeptId());
+ approvers.add(approver);
+
+ log.info("备选方案：添加院领导审批人: userId={}, userName={}, nickName={}",
+ user.getUserId(), user.getUserName(), user.getNickName());
+ }
}
}
}
- log.info("查询院领导审批人完成，共找到 {} 个院领导", approvers.size());
+ log.info("查询院领导审批人完成，共找到 {} 个院领导（权限验证+部门备选）", approvers.size());
} catch (Exception e) {
log.error("查询院领导审批人失败：{}", e.getMessage(), e);
diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwProjectApplicationServiceImpl.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwProjectApplicationServiceImpl.java
index 9264426f..a6d59fba 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwProjectApplicationServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwProjectApplicationServiceImpl.java
@@ -86,13 +86,29 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
log.info("✅ [统计页面-项目清单] 查询完成");
log.info("📊 [统计页面-项目清单] 查询结果: 总数={}, 当前页记录数={}", result.getTotal(), result.getRecords().size());
+ // 🔧 为每个项目补充绩效指标数据（修复统计页面详情缺少绩效指标的问题）
if (!result.getRecords().isEmpty()) {
+ log.info("🔄 [统计页面-项目清单] 开始补充绩效指标数据...");
+ for (CwProjectApplicationVo record : result.getRecords()) {
+ try {
+ List performanceIndicators = performanceIndicatorService.queryByApplicationId(record.getId());
+ record.setPerformanceIndicators(performanceIndicators);
+ log.debug(" ✅ 项目ID: {} 绩效指标数量: {}", record.getId(), performanceIndicators.size());
+ } catch (Exception e) {
+ log.error(" ❌ 获取项目ID: {} 的绩效指标数据失败: {}", record.getId(), e.getMessage());
+ // 设置空列表，避免前端报错
+ record.setPerformanceIndicators(new ArrayList<>());
+ }
+ }
+ log.info("✅ [统计页面-项目清单] 绩效指标数据补充完成");
+
log.info("📝 [统计页面-项目清单] 前3条数据示例:");
for (int i = 0; i < Math.min(result.getRecords().size(), 3); i++) {
CwProjectApplicationVo record = result.getRecords().get(i);
- log.info(" {}. ID: {}, 申报编号: {}, 项目名称: {}, 状态: {}, 申报人: {}, 部门: {}",
+ int indicatorCount = record.getPerformanceIndicators() != null ? record.getPerformanceIndicators().size() : 0;
+ log.info(" {}. ID: {}, 申报编号: {}, 项目名称: {}, 状态: {}, 申报人: {}, 部门: {}, 绩效指标数: {}",
i + 1, record.getId(), record.getApplicationNo(), record.getProjectName(),
- record.getApprovalStatus(), record.getApplicantName(), record.getDepartmentName());
+ record.getApprovalStatus(), record.getApplicantName(), record.getDepartmentName(), indicatorCount);
}
} else {
log.warn("⚠️ [统计页面-项目清单] 查询结果为空！");
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/JcbtPovertyApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java
new file mode 100644
index 00000000..06f10937
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java
@@ -0,0 +1,317 @@
+package org.dromara.jcbt.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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 lombok.extern.slf4j.Slf4j;
+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.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.jcbt.domain.bo.AuditRequestBo;
+import org.dromara.jcbt.domain.bo.JcbtPovertyApplicationBo;
+import org.dromara.jcbt.domain.vo.JcbtPovertyApplicationVo;
+import org.dromara.jcbt.service.IJcbtPovertyApplicationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * 贫困生认定申请管理
+ *
+ * @author ruoyi
+ * @date 2025-08-09
+ */
+@Slf4j
+@Validated
+@Tag(name = "贫困生认定申请管理", description = "贫困生认定申请管理Controller")
+@RestController
+@RequestMapping("/jcbt/povertyApplication")
+public class JcbtPovertyApplicationController extends BaseController {
+
+ @Autowired
+ private IJcbtPovertyApplicationService povertyApplicationService;
+
+ // ========== 基础管理接口（6个） ==========
+
+ /**
+ * 查询贫困生认定申请列表
+ */
+ @SaCheckPermission("jcbt:povertyApplication:list")
+ @GetMapping("/list")
+ @Operation(summary = "查询贫困生认定申请列表")
+ public TableDataInfo list(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
+ return povertyApplicationService.queryPageList(bo, pageQuery);
+ }
+
+ /**
+ * 获取贫困生认定申请详细信息
+ */
+ @SaCheckPermission("jcbt:povertyApplication:query")
+ @GetMapping("/{id}")
+ @Operation(summary = "获取贫困生认定申请详细信息")
+ public R getInfo(@Parameter(description = "主键") @PathVariable Long id) {
+ return R.ok(povertyApplicationService.queryById(id));
+ }
+
+ /**
+ * 新增贫困生认定申请
+ */
+ @SaCheckPermission("jcbt:povertyApplication:add")
+ @Log(title = "贫困生认定申请", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping
+ @Operation(summary = "新增贫困生认定申请")
+ public R add(@Parameter(description = "贫困生认定申请") @Validated(AddGroup.class) @RequestBody JcbtPovertyApplicationBo bo) {
+ return toAjax(povertyApplicationService.insertByBo(bo));
+ }
+
+ /**
+ * 修改贫困生认定申请
+ */
+ @SaCheckPermission("jcbt:povertyApplication:edit")
+ @Log(title = "贫困生认定申请", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping
+ @Operation(summary = "修改贫困生认定申请")
+ public R edit(@Parameter(description = "贫困生认定申请") @Validated(EditGroup.class) @RequestBody JcbtPovertyApplicationBo bo) {
+ return toAjax(povertyApplicationService.updateByBo(bo));
+ }
+
+ /**
+ * 删除贫困生认定申请
+ */
+ @SaCheckPermission("jcbt:povertyApplication:remove")
+ @Log(title = "删除贫困生认定申请", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ @Operation(summary = "删除贫困生认定申请")
+ public R remove(@Parameter(description = "主键集合") @NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+ return toAjax(povertyApplicationService.deleteWithValidByIds(List.of(ids), true));
+ }
+
+ /**
+ * 导出贫困生认定申请列表
+ */
+ @SaCheckPermission("jcbt:povertyApplication:export")
+ @Log(title = "导出贫困生认定申请", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @Operation(summary = "导出贫困生认定申请列表")
+ public void export(JcbtPovertyApplicationBo bo, HttpServletResponse response) {
+ List list = povertyApplicationService.queryList(bo);
+ ExcelUtil.exportExcel(list, "贫困生认定申请", JcbtPovertyApplicationVo.class, response);
+ }
+
+ // ========== 业务功能接口（4个） ==========
+
+ /**
+ * 查询我的申请列表（班主任查看自己提交的申请）
+ */
+ @SaCheckPermission("jcbt:povertyApplication:myList")
+ @GetMapping("/myList")
+ @Operation(summary = "查询我的申请列表")
+ public TableDataInfo myList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
+ Long teacherId = LoginHelper.getUserId();
+ return povertyApplicationService.queryPageListByTeacher(teacherId, bo, pageQuery);
+ }
+
+ /**
+ * 查询待审核申请列表（审核人员使用）
+ */
+ @SaCheckPermission("jcbt:povertyApplication:pendingList")
+ @GetMapping("/pendingList")
+ @Operation(summary = "查询待审核申请列表")
+ public TableDataInfo pendingList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
+ return povertyApplicationService.queryPendingPageList(bo, pageQuery);
+ }
+
+ /**
+ * 提交申请
+ */
+ @SaCheckPermission("jcbt:povertyApplication:submit")
+ @Log(title = "提交贫困生认定申请", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping("/submit/{id}")
+ @Operation(summary = "提交申请")
+ public R submit(@Parameter(description = "申请ID") @PathVariable Long id) {
+ return toAjax(povertyApplicationService.submitApplication(id));
+ }
+
+ /**
+ * 撤销申请
+ */
+ @SaCheckPermission("jcbt:povertyApplication:cancel")
+ @Log(title = "撤销贫困生认定申请", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping("/cancel/{id}")
+ @Operation(summary = "撤销申请")
+ public R cancel(@Parameter(description = "申请ID") @PathVariable Long id) {
+ return toAjax(povertyApplicationService.cancelApplication(id));
+ }
+
+ // ========== 辅助功能接口（6个） ==========
+
+ /**
+ * 根据申请编号获取申请信息
+ */
+ @SaCheckPermission("jcbt:povertyApplication:query")
+ @GetMapping("/byApplicationNo/{applicationNo}")
+ @Operation(summary = "根据申请编号获取申请信息")
+ public R getInfoByApplicationNo(@Parameter(description = "申请编号") @PathVariable String applicationNo) {
+ return R.ok(povertyApplicationService.queryByApplicationNo(applicationNo));
+ }
+
+ /**
+ * 保存草稿
+ */
+ @SaCheckPermission("jcbt:povertyApplication:saveDraft")
+ @Log(title = "保存贫困生认定申请草稿", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/saveDraft")
+ @Operation(summary = "保存草稿")
+ public R saveDraft(@Parameter(description = "贫困生认定申请") @RequestBody JcbtPovertyApplicationBo bo) {
+ return toAjax(povertyApplicationService.saveDraft(bo));
+ }
+
+ /**
+ * 审核通过
+ */
+ @SaCheckPermission("jcbt:povertyApplication:approve")
+ @Log(title = "审核通过贫困生认定申请", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping("/approve")
+ @Operation(summary = "审核通过")
+ public R approve(@Parameter(description = "审核请求") @Validated @RequestBody AuditRequestBo auditRequest) {
+ return toAjax(povertyApplicationService.approveApplication(auditRequest.getId(), auditRequest.getAuditOpinion()));
+ }
+
+ /**
+ * 审核驳回
+ */
+ @SaCheckPermission("jcbt:povertyApplication:reject")
+ @Log(title = "审核驳回贫困生认定申请", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping("/reject")
+ @Operation(summary = "审核驳回")
+ public R reject(@Parameter(description = "审核请求") @Validated @RequestBody AuditRequestBo auditRequest) {
+ return toAjax(povertyApplicationService.rejectApplication(auditRequest.getId(), auditRequest.getAuditOpinion()));
+ }
+
+ /**
+ * 生成申请编号
+ */
+ @SaCheckPermission("jcbt:povertyApplication:add")
+ @GetMapping("/generateApplicationNo")
+ @Operation(summary = "生成申请编号")
+ public R generateApplicationNo() {
+ return R.ok(povertyApplicationService.generateApplicationNo());
+ }
+
+ /**
+ * 检查学生申请是否重复
+ */
+ @SaCheckPermission("jcbt:povertyApplication:add")
+ @GetMapping("/checkDuplicate")
+ @Operation(summary = "检查学生申请是否重复")
+ public R checkDuplicate(@Parameter(description = "学生ID") @RequestParam Long studentId,
+ @Parameter(description = "学年") @RequestParam String academicYear,
+ @Parameter(description = "认定类型ID") @RequestParam Long recognitionTypeId,
+ @Parameter(description = "排除的申请ID") @RequestParam(required = false) Long excludeId) {
+ boolean exists = povertyApplicationService.checkStudentApplicationExists(studentId, academicYear, recognitionTypeId, excludeId);
+ return R.ok(exists);
+ }
+
+ // ========== 统计分析接口（2个） ==========
+
+ /**
+ * 获取申请统计信息
+ */
+ @SaCheckPermission("jcbt:povertyApplication:statistics")
+ @GetMapping("/statistics")
+ @Operation(summary = "获取申请统计信息")
+ public R> statistics(@Parameter(description = "班主任ID") @RequestParam(required = false) Long teacherId) {
+ List statisticsList = povertyApplicationService.getApplicationStatistics(teacherId);
+
+ // 转换为前端需要的格式
+ Map result = new HashMap<>();
+ Map statusCount = new HashMap<>();
+ int totalCount = 0;
+
+ for (JcbtPovertyApplicationVo stat : statisticsList) {
+ String status = stat.getStatus();
+ Integer count = stat.getId().intValue(); // 统计查询中，id字段存储的是count值
+ statusCount.put(status, count);
+ totalCount += count;
+ }
+
+ result.put("statusCount", statusCount);
+ result.put("totalCount", totalCount);
+ return R.ok(result);
+ }
+
+ /**
+ * 获取我的申请统计信息（班主任使用）
+ */
+ @SaCheckPermission("jcbt:povertyApplication:myList")
+ @GetMapping("/myStatistics")
+ @Operation(summary = "获取我的申请统计信息")
+ public R> myStatistics() {
+ Long teacherId = LoginHelper.getUserId();
+ List statisticsList = povertyApplicationService.getApplicationStatistics(teacherId);
+
+ // 转换为前端需要的格式
+ Map result = new HashMap<>();
+ Map statusCount = new HashMap<>();
+ int totalCount = 0;
+
+ for (JcbtPovertyApplicationVo stat : statisticsList) {
+ String status = stat.getStatus();
+ Integer count = stat.getId().intValue(); // 统计查询中，id字段存储的是count值
+ statusCount.put(status, count);
+ totalCount += count;
+ }
+
+ result.put("statusCount", statusCount);
+ result.put("totalCount", totalCount);
+ return R.ok(result);
+ }
+
+ /**
+ * 获取当前用户班级信息
+ */
+ @Operation(summary = "获取当前用户班级信息")
+ @SaCheckPermission("jcbt:povertyApplication:list")
+ @GetMapping("/user/classes")
+ public R>> getCurrentUserClasses() {
+ Long currentUserId = LoginHelper.getLoginUser().getUserId();
+ List> classes = povertyApplicationService.getCurrentUserClasses(currentUserId);
+ return R.ok(classes);
+ }
+
+ /**
+ * 获取班级学生列表
+ */
+ @Operation(summary = "获取班级学生列表")
+ @Parameter(name = "classId", description = "班级ID", required = true)
+ @SaCheckPermission("jcbt:povertyApplication:list")
+ @GetMapping("/class/{classId}/students")
+ public R>> getClassStudents(@PathVariable Long classId) {
+ List> students = povertyApplicationService.getClassStudents(classId);
+ return R.ok(students);
+ }
+
+}
\ No newline at end of file
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..52d858fb
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java
@@ -0,0 +1,417 @@
+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 lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * 奖学金申请记录管理
+ *
+ * @author ruoyi
+ * @date 2025-01-01
+ */
+@Slf4j
+@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) {
+ log.info("🔍 [DEBUG] Controller.edit 开始执行");
+ log.info("🔍 [DEBUG] 接收到的BO对象: {}", bo);
+ log.info("🔍 [DEBUG] 关键字段检查:");
+ log.info(" - id: {}", bo.getId());
+ log.info(" - studentNo: {}", bo.getStudentNo());
+ log.info(" - studentName: {}", bo.getStudentName());
+ log.info(" - status: {}", bo.getStatus());
+ log.info(" - currentStatus: {}", bo.getCurrentStatus());
+ log.info(" - reviewComment: {}", bo.getReviewComment());
+
+ try {
+ boolean result = applicationService.updateByBo(bo);
+ log.info("🔍 [DEBUG] Service.updateByBo 执行结果: {}", result);
+ return toAjax(result);
+ } catch (Exception e) {
+ log.error("❌ [ERROR] Controller.edit 执行异常", e);
+ log.error("❌ [ERROR] 异常类型: {}", e.getClass().getSimpleName());
+ log.error("❌ [ERROR] 异常消息: {}", e.getMessage());
+ throw e;
+ }
+ }
+
+ /**
+ * 删除奖学金申请记录
+ */
+ @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);
+ }
+
+ /**
+ * 调试接口：详细SQL日志输出测试
+ */
+ @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
+ @GetMapping("/debug/sqlLogs")
+ @Operation(summary = "调试接口：详细SQL日志输出测试")
+ public R> debugSqlLogs(@Parameter(description = "批次ID") @RequestParam Long batchId,
+ @Parameter(description = "班级ID") @RequestParam Long classId,
+ @Parameter(description = "奖学金类型ID（可选，测试单个类型）") @RequestParam(required = false) Long scholarshipTypeId) {
+ Map result = new HashMap<>();
+
+ try {
+ log.info("🚀 === SQL调试接口开始 ===");
+ log.info("📥 接收参数: batchId={}, classId={}, scholarshipTypeId={}", batchId, classId, scholarshipTypeId);
+
+ result.put("requestParams", Map.of(
+ "batchId", batchId,
+ "classId", classId,
+ "scholarshipTypeId", scholarshipTypeId
+ ));
+
+ // 如果指定了奖学金类型ID，则只测试该类型
+ if (scholarshipTypeId != null) {
+ log.info("🎯 单个奖学金类型测试模式");
+
+ // 测试班级名额查询
+ log.info("📊 开始测试班级名额查询");
+ var classQuota = applicationService.testClassQuotaQuery(classId, scholarshipTypeId, batchId);
+ result.put("classQuotaTest", classQuota);
+
+ // 测试全校名额查询
+ log.info("🏫 开始测试全校名额查询");
+ var schoolQuota = applicationService.testSchoolQuotaQuery(batchId, scholarshipTypeId);
+ result.put("schoolQuotaTest", schoolQuota);
+
+ } else {
+ log.info("📋 完整流程测试模式");
+ // 完整流程测试
+ var quotaResult = applicationService.getScholarshipTypesWithQuota(batchId, classId);
+ result.put("fullProcessTest", quotaResult);
+ }
+
+ result.put("status", "success");
+ result.put("timestamp", System.currentTimeMillis());
+
+ log.info("✅ === SQL调试接口完成 ===");
+
+ } catch (Exception e) {
+ log.error("❌ === SQL调试接口异常 ===", e);
+ result.put("status", "error");
+ result.put("error", e.getMessage());
+ result.put("stackTrace", e.getStackTrace());
+ }
+
+ 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/JcbtScholarshipReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java
new file mode 100644
index 00000000..56bba32e
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java
@@ -0,0 +1,263 @@
+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.JcbtScholarshipReviewBo;
+import org.dromara.jcbt.domain.vo.JcbtScholarshipReviewVo;
+import org.dromara.jcbt.service.IJcbtScholarshipReviewService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 奖学金审核记录
+ *
+ * @author ruoyi
+ * @date 2025-08-05
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jcbt/review")
+public class JcbtScholarshipReviewController extends BaseController {
+
+ private final IJcbtScholarshipReviewService reviewService;
+
+ /**
+ * 查询奖学金审核记录列表
+ */
+ @SaCheckPermission("jcbt:review:list")
+ @GetMapping("/list")
+ public TableDataInfo list(JcbtScholarshipReviewBo bo, PageQuery pageQuery) {
+ return reviewService.queryPageList(bo, pageQuery);
+ }
+
+ /**
+ * 导出奖学金审核记录列表
+ */
+ @SaCheckPermission("jcbt:review:export")
+ @Log(title = "奖学金审核记录", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(JcbtScholarshipReviewBo bo, HttpServletResponse response) {
+ List list = reviewService.queryList(bo);
+ ExcelUtil.exportExcel(list, "奖学金审核记录", JcbtScholarshipReviewVo.class, response);
+ }
+
+ /**
+ * 获取奖学金审核记录详细信息
+ */
+ @SaCheckPermission("jcbt:review:query")
+ @GetMapping("/{id}")
+ public R getInfo(@NotNull(message = "主键不能为空")
+ @PathVariable Long id) {
+ return R.ok(reviewService.queryById(id));
+ }
+
+ // 注意：审核记录不允许手动新增、修改、删除
+ // 审核记录应由系统在申请提交时自动创建
+ // 仅保留查询和审核操作功能
+
+ /**
+ * 根据申请ID查询审核记录
+ */
+ @SaCheckPermission("jcbt:review:query")
+ @GetMapping("/application/{applicationId}")
+ public R> getReviewsByApplicationId(
+ @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
+ return R.ok(reviewService.queryReviewsByApplicationId(applicationId));
+ }
+
+ /**
+ * 查询当前用户待审核的记录
+ */
+ @SaCheckPermission("jcbt:review:pending")
+ @GetMapping("/pending")
+ public TableDataInfo getPendingReviews(
+ @RequestParam(required = false) Long reviewerId,
+ @RequestParam(required = false) String reviewLevel,
+ @RequestParam(required = false) String applicationNo,
+ @RequestParam(required = false) String studentName,
+ PageQuery pageQuery) {
+ return reviewService.queryPendingReviews(reviewerId, reviewLevel, applicationNo, studentName, pageQuery);
+ }
+
+ /**
+ * 查询审核历史记录
+ */
+ @SaCheckPermission("jcbt:review:history")
+ @GetMapping("/history")
+ public TableDataInfo getReviewHistory(
+ @RequestParam(required = false) Long reviewerId,
+ @RequestParam(required = false) String reviewResult,
+ @RequestParam(required = false) Long batchId,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime,
+ PageQuery pageQuery) {
+ return reviewService.queryReviewHistory(reviewerId, reviewResult, batchId, startTime, endTime, pageQuery);
+ }
+
+ /**
+ * 提交审核结果
+ */
+ @SaCheckPermission("jcbt:review:approve")
+ @Log(title = "提交审核结果", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/submit")
+ public R submitReview(
+ @NotNull(message = "审核记录ID不能为空") @RequestParam Long reviewId,
+ @NotEmpty(message = "审核结果不能为空") @RequestParam String reviewResult,
+ @RequestParam(required = false) String reviewOpinion,
+ @RequestParam(required = false) Double reviewScore,
+ @RequestParam(required = false) Long nextReviewerId) {
+ return toAjax(reviewService.submitReview(reviewId, reviewResult, reviewOpinion, reviewScore, nextReviewerId));
+ }
+
+ /**
+ * 批量审核
+ */
+ @SaCheckPermission("jcbt:review:batchApprove")
+ @Log(title = "批量审核", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/batch")
+ public R batchReview(
+ @NotEmpty(message = "审核记录ID列表不能为空") @RequestParam List reviewIds,
+ @NotEmpty(message = "审核结果不能为空") @RequestParam String reviewResult,
+ @RequestParam(required = false) String reviewOpinion,
+ @NotNull(message = "审核人ID不能为空") @RequestParam Long reviewerId,
+ @NotEmpty(message = "审核人姓名不能为空") @RequestParam String reviewerName) {
+ return toAjax(reviewService.batchReview(reviewIds, reviewResult, reviewOpinion, reviewerId, reviewerName));
+ }
+
+ // 注意：审核任务创建通常在申请提交时自动触发
+ // 此接口保留作为补偿性操作，用于特殊情况下手动创建审核任务
+
+ /**
+ * 转移审核任务
+ */
+ @SaCheckPermission("jcbt:review:transfer")
+ @Log(title = "转移审核任务", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/transfer")
+ public R transferReview(
+ @NotNull(message = "审核记录ID不能为空") @RequestParam Long reviewId,
+ @NotNull(message = "新审核人ID不能为空") @RequestParam Long newReviewerId,
+ @NotEmpty(message = "新审核人姓名不能为空") @RequestParam String newReviewerName,
+ @RequestParam(required = false) String reason) {
+ return toAjax(reviewService.transferReview(reviewId, newReviewerId, newReviewerName, reason));
+ }
+
+ /**
+ * 撤回审核结果
+ */
+ @SaCheckPermission("jcbt:review:revoke")
+ @Log(title = "撤回审核结果", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/withdraw")
+ public R withdrawReview(
+ @NotNull(message = "审核记录ID不能为空") @RequestParam Long reviewId,
+ @RequestParam(required = false) String reason) {
+ return toAjax(reviewService.withdrawReview(reviewId, reason));
+ }
+
+ /**
+ * 查询某个申请的最新审核记录
+ */
+ @SaCheckPermission("jcbt:review:query")
+ @GetMapping("/latest/{applicationId}")
+ public R getLatestReview(
+ @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
+ return R.ok(reviewService.queryLatestReviewByApplicationId(applicationId));
+ }
+
+ /**
+ * 查询某个申请的指定级别审核记录
+ */
+ @SaCheckPermission("jcbt:review:query")
+ @GetMapping("/level/{applicationId}/{reviewLevel}")
+ public R getReviewByLevel(
+ @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
+ @NotEmpty(message = "审核级别不能为空") @PathVariable String reviewLevel) {
+ return R.ok(reviewService.queryReviewByApplicationAndLevel(applicationId, reviewLevel));
+ }
+
+ /**
+ * 统计审核数量
+ */
+ @SaCheckPermission("jcbt:review:statistics")
+ @GetMapping("/statistics/count")
+ public R> getReviewCount(
+ @RequestParam(required = false) Long reviewerId,
+ @RequestParam(required = false) String reviewLevel,
+ @RequestParam(required = false) String reviewResult,
+ @RequestParam(required = false) Long batchId) {
+ return R.ok(reviewService.countReviewsByCondition(reviewerId, reviewLevel, reviewResult, batchId));
+ }
+
+ /**
+ * 获取下一级审核人员列表
+ */
+ @SaCheckPermission("jcbt:review:query")
+ @GetMapping("/next-reviewers/{applicationId}/{currentLevel}")
+ public R> getNextReviewers(
+ @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
+ @NotEmpty(message = "当前审核级别不能为空") @PathVariable String currentLevel) {
+ return R.ok(reviewService.getNextReviewers(applicationId, currentLevel));
+ }
+
+ /**
+ * 审核流程推进
+ */
+ @SaCheckPermission("jcbt:review:approve")
+ @Log(title = "审核流程推进", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/advance")
+ public R advanceReviewProcess(
+ @NotNull(message = "申请ID不能为空") @RequestParam Long applicationId,
+ @NotEmpty(message = "当前审核级别不能为空") @RequestParam String currentLevel,
+ @NotEmpty(message = "审核结果不能为空") @RequestParam String reviewResult,
+ @RequestParam(required = false) String reviewOpinion,
+ @RequestParam(required = false) Double reviewScore) {
+ return toAjax(reviewService.advanceReviewProcess(applicationId, currentLevel, reviewResult, reviewOpinion, reviewScore));
+ }
+
+ /**
+ * 检查用户审核权限
+ */
+ @SaCheckPermission("jcbt:review:query")
+ @GetMapping("/permission")
+ public R checkReviewPermission(
+ @NotNull(message = "审核人ID不能为空") @RequestParam Long reviewerId,
+ @NotEmpty(message = "审核级别不能为空") @RequestParam String reviewLevel,
+ @NotNull(message = "申请ID不能为空") @RequestParam Long applicationId) {
+ return R.ok(reviewService.checkReviewPermission(reviewerId, reviewLevel, applicationId));
+ }
+
+ /**
+ * 获取审核统计信息
+ */
+ @SaCheckPermission("jcbt:review:statistics")
+ @GetMapping("/statistics")
+ public R> getReviewStatistics(
+ @RequestParam(required = false) Long reviewerId,
+ @RequestParam(required = false) String reviewLevel,
+ @RequestParam(required = false) Long batchId) {
+ return R.ok(reviewService.getReviewStatistics(reviewerId, reviewLevel, batchId));
+ }
+
+}
+
\ No newline at end of file
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