marking
/
Learn.Archives
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

merge into: marking:staging
Branches Tags
marking:master
marking:dev
marking:staging
...
pull from: marking:master
Branches Tags
marking:master
marking:dev
marking:staging

60 Commits
staging ... master

Author SHA1 Message Date
hy f48413eb50 Merge pull request 'dev' (#57) from dev into master 
Reviewed-on: #57
 2026-04-21 16:49:00 +08:00
小肥羊 f80ace8af8 修复 排除无就读情况的学生 2026-04-21 16:31:22 +08:00
小肥羊 a39fa1b34f 修复 排除无就读情况的学生 2026-04-21 16:29:17 +08:00
hy bf8fb54aa2 Merge pull request 'staging' (#55) from staging into master 
Reviewed-on: #55
 2025-12-08 18:20:45 +08:00
hy cb6cfe271a Merge pull request '修复 Excel更新学生信息时 关联表无数据的更新所以导致功能为实现' (#54) from dev into staging 
Reviewed-on: #54
 2025-12-08 18:13:35 +08:00
hy 2960394142 Merge pull request 'staging' (#53) from staging into master 
Reviewed-on: #53
 2025-12-08 09:45:55 +08:00
hy 69a888553f Merge pull request '修复 更新学生学科 导致的学科枚举转换异常问题' (#52) from dev into staging 
Reviewed-on: #52
 2025-12-08 09:41:53 +08:00
hy 9d3d91e603 Merge pull request 'staging' (#51) from staging into master 
Reviewed-on: #51
 2025-12-06 21:53:07 +08:00
hy 119a48b5e5 Merge pull request 'dev' (#50) from dev into staging 
Reviewed-on: #50
 2025-12-05 19:06:22 +08:00
hy 36520ab5ec Merge pull request 'staging' (#49) from staging into master 
Reviewed-on: #49
 2025-12-04 18:37:26 +08:00
hy 613e5edb32 Merge pull request '新增 无法识别的考试成绩 提示错误' (#48) from dev into staging 
Reviewed-on: #48
 2025-12-04 18:35:20 +08:00
hy 8a9838c541 Merge pull request 'dev' (#47) from dev into staging 
Reviewed-on: #47
 2025-12-04 17:57:32 +08:00
hy 3832ecb8bb Merge pull request 'staging' (#46) from staging into master 
Reviewed-on: #46
 2025-11-28 10:19:33 +08:00
hy aca959b097 Merge pull request '优化 导入考试信息功能' (#45) from dev into staging 
Reviewed-on: #45
 2025-11-28 10:18:56 +08:00
hy d323635ad1 Merge pull request 'staging' (#44) from staging into master 
Reviewed-on: #44
 2025-11-27 12:32:11 +08:00
hy 32d52a992b Merge pull request 'dev' (#43) from dev into staging 
Reviewed-on: #43
 2025-11-27 12:31:56 +08:00
hy 457b4cd450 Merge pull request 'staging' (#42) from staging into master 
Reviewed-on: #42
 2025-11-17 18:38:42 +08:00
hy fade4388cd Merge pull request '修复 编辑学生信息时候减免金额未填写可能导致的400' (#41) from dev into staging 
Reviewed-on: #41
 2025-11-17 18:38:14 +08:00
hy d185ff09ee Merge pull request 'staging' (#40) from staging into master 
Reviewed-on: #40
 2025-11-17 18:33:37 +08:00
hy 82d9fc1999 Merge pull request '修复 编辑学生信息时候减免金额未填写可能导致的400' (#39) from dev into staging 
Reviewed-on: #39
 2025-11-17 18:33:15 +08:00
hy 708bb67cb7 Merge pull request 'staging' (#38) from staging into master 
Reviewed-on: #38
 2025-11-17 18:24:24 +08:00
hy c4030a40d1 Merge pull request '修复 编辑学生信息时候减免金额未填写可能导致的400' (#37) from dev into staging 
Reviewed-on: #37
 2025-11-17 18:24:11 +08:00
hy cd4bf087a2 Merge pull request '修复 新增 token失效检查' (#36) from dev into staging 
Reviewed-on: #36
 2025-11-17 18:12:29 +08:00
hy cf26ec6290 Merge pull request 'staging' (#35) from staging into master 
Reviewed-on: #35
 2025-11-14 09:29:40 +08:00
hy a25722b88b Merge pull request 'dev' (#34) from dev into staging 
Reviewed-on: #34
 2025-11-13 16:57:06 +08:00
hy c84e4e089a Merge pull request 'staging' (#33) from staging into master 
Reviewed-on: #33
 2025-11-12 17:55:00 +08:00
hy 8003d82687 Merge pull request 'dev' (#32) from dev into staging 
Reviewed-on: #32
 2025-11-12 17:54:46 +08:00
hy 249917e460 Merge pull request 'staging' (#31) from staging into master 
Reviewed-on: #31
 2025-11-11 18:36:28 +08:00
hy 4e6f8c9c84 Merge pull request 'dev' (#30) from dev into staging 
Reviewed-on: #30
 2025-11-11 18:36:13 +08:00
hy 1f82aa960a Merge pull request '修复 学生管理页面查询错误问题' (#29) from dev into master 
Reviewed-on: #29
 2025-10-29 17:51:11 +08:00
hy 7bb3b2e663 Merge pull request 'staging' (#28) from staging into master 
Reviewed-on: #28
 2025-10-18 23:06:55 +08:00
hy f45882a9bf Merge pull request '迁移 新版用户中心连接字符串' (#27) from dev into staging 
Reviewed-on: #27
 2025-10-18 23:06:10 +08:00
hy 1bc39925ca Merge pull request 'staging' (#26) from staging into master 
Reviewed-on: #26
 2025-10-14 15:44:16 +08:00
hy d7db0f2ae5 Merge pull request '修改 导入模板的例子数据' (#25) from dev into staging 
Reviewed-on: #25
 2025-10-14 15:44:07 +08:00
hy cfee8390b3 Merge pull request 'staging' (#24) from staging into master 
Reviewed-on: #24
 2025-10-14 14:36:53 +08:00
hy 2fc7169366 Merge pull request '修复 配置文件节点错误问题' (#23) from dev into staging 
Reviewed-on: #23
 2025-10-14 14:36:40 +08:00
hy 10e9e5f2ac Merge pull request 'staging' (#22) from staging into master 
Reviewed-on: #22
 2025-10-14 14:16:13 +08:00
hy f511da7e77 Merge pull request '新增 环境配置文件接口' (#21) from dev into staging 
Reviewed-on: #21
 2025-10-14 14:15:59 +08:00
hy 8135ee0f4c Merge pull request 'staging' (#20) from staging into master 
Reviewed-on: #20
 2025-10-14 11:13:23 +08:00
hy 628c1c5b3c Merge pull request '优化 日志记录 管理员导入' (#19) from dev into staging 
Reviewed-on: #19
 2025-10-14 11:08:18 +08:00
hy 07967f1390 Merge pull request '修复 上线率为分析原因' (#18) from dev into staging 
Reviewed-on: #18
 2025-09-25 16:10:44 +08:00
hy 218bf66fc6 Merge pull request 'dev' (#17) from dev into staging 
Reviewed-on: #17
 2025-09-25 15:48:34 +08:00
hy db0e5905fa Merge pull request 'dev' (#16) from dev into staging 
Reviewed-on: #16
 2025-09-24 19:18:29 +08:00
hy 67363cd50d Merge pull request 'dev' (#15) from dev into staging 
Reviewed-on: #15
 2025-09-14 15:46:47 +08:00
hy 314e169171 Merge pull request 'dev' (#14) from dev into master 
Reviewed-on: #14
 2025-08-27 17:26:10 +08:00
hy a1a6324b8b Merge pull request 'dev' (#13) from dev into staging 
Reviewed-on: #13
 2025-08-27 15:44:33 +08:00
hy 12ffbe5754 Merge pull request '新增 edit学生类型' (#12) from dev into staging 
Reviewed-on: #12
 2025-08-27 10:37:25 +08:00
hy 43491ea620 Merge pull request 'dev' (#11) from dev into master 
Reviewed-on: #11
 2025-08-27 10:02:50 +08:00
hy ab5fc42607 Merge pull request '优化 赴校信息导入模板1' (#10) from dev into staging 
Reviewed-on: #10
 2025-08-26 20:17:47 +08:00
hy 5a57775779 Merge pull request 'dev' (#9) from dev into master 
Reviewed-on: #9
 2025-08-26 20:11:07 +08:00
hy a5e044ca7e Merge pull request '优化 赴校信息导入模板' (#8) from dev into staging 
Reviewed-on: #8
 2025-08-26 20:10:16 +08:00
hy ae5d2a8293 Merge pull request 'dev' (#7) from dev into staging 
Reviewed-on: #7
 2025-08-26 19:59:55 +08:00
hy 119576da72 Merge pull request 'dev' (#6) from dev into staging 
Reviewed-on: #6
 2025-08-26 19:21:24 +08:00
tiananlin 57e98333cf 添加 Learn.Archives.API/Dockerfiles/Dockerfile-production 2025-08-26 15:14:35 +08:00
tiananlin eb1985c747 添加 Learn.Archives.API/Dockerfiles/Dockerfile-production 2025-08-26 15:13:30 +08:00
hy d22e07353d Merge pull request 'dev' (#5) from dev into staging 
Reviewed-on: #5
 2025-08-26 14:36:39 +08:00
hy aa7b035eb6 Merge pull request 'dev' (#4) from dev into staging 
Reviewed-on: #4
 2025-08-26 10:10:35 +08:00
hy 02eeec5ecd Merge pull request 'dev' (#3) from dev into master 
Reviewed-on: #3
 2025-08-26 10:04:22 +08:00
hy 520a3ef59f Merge pull request '完善 学生导入新增的字段' (#2) from dev into staging 
Reviewed-on: #2
 2025-08-25 16:53:30 +08:00
hy 2e11e7a1b9 Merge pull request '新增 测试环境配置' (#1) from dev into master 
Reviewed-on: #1
 2025-08-25 10:43:50 +08:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
Learn.Archives.API/Controllers/ExamClassInfoController.cs
View File

@ -96,7 +96,7 @@ namespace Learn.Archives.API.Controllers
c.GradeLevel == gradeInfo.GradeLevel &&
c.GraduationYear == gradeInfo.GradeYear &&
u.UserType == UserTypeEnum.学生.GetHashCode() &&
s.Enable && p.Enable && pr.Enable &&
s.Enable && p.Enable && pr.Enable && pr.Status == PositionRelationStatusEnum.就读任职 &&
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
.Select((s, c, p, pr, u) => new
{

2
Learn.Archives.API/Controllers/StudentController.cs
View File

@ -380,7 +380,7 @@ namespace Learn.Archives.API.Controllers
s.Id == schoolId &&
u.UserType == UserTypeEnum.学生.GetHashCode() &&
batch.Contains(u.RealName) &&
s.Enable && p.Enable && pr.Enable &&
s.Enable && p.Enable && pr.Enable && pr.Status == PositionRelationStatusEnum.就读任职&&
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
.Select((s, c, p, pr, u) => new
{