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

dev #4

Merged
hy merged 2 commits from dev into staging 2025-08-26 10:10:35 +08:00
Conversation 0 Commits 2 Files Changed 4 +5 -1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bbfb9c9f85 - Show all commits

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

@ -1,6 +1,7 @@
using Learn.Archives.API.Controllers.Dto; using Learn.Archives.API.Controllers.Dto;
using Learn.Archives.API.Expand; using Learn.Archives.API.Expand;
using Learn.Archives.Core.Common; using Learn.Archives.Core.Common;
using Learn.Archives.Core.Common.Expand;
using Learn.Archives.Core.Model; using Learn.Archives.Core.Model;
using Learn.Archives.Core.Model.Dto; using Learn.Archives.Core.Model.Dto;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -84,6 +85,7 @@ namespace Learn.Archives.API.Controllers
var insertUserInfo = new List<ExamUserInfo>(); var insertUserInfo = new List<ExamUserInfo>();
var insertClassInfo = new List<ExamClassInfo>(); var insertClassInfo = new List<ExamClassInfo>();
var db = schoolService.Context; var db = schoolService.Context;
SqlSugarExpand.SetDbAop(db);
foreach (var schoolArr in dataList.GroupBy(s => s.School)) foreach (var schoolArr in dataList.GroupBy(s => s.School))
{ {
var school = await schoolService.GetFirstAsync(s => s.Name == schoolArr.Key); var school = await schoolService.GetFirstAsync(s => s.Name == schoolArr.Key);
@ -94,6 +96,7 @@ namespace Learn.Archives.API.Controllers
var classArr = await db.Queryable<Classes>().Where(c => c.SchoolId == school.Id && var classArr = await db.Queryable<Classes>().Where(c => c.SchoolId == school.Id &&
c.GradeLevel == gradeInfo.GradeLevel && c.GradeLevel == gradeInfo.GradeLevel &&
c.GraduationYear == gradeInfo.GradeYear && !c.DeleteState).ToArrayAsync(); c.GraduationYear == gradeInfo.GradeYear && !c.DeleteState).ToArrayAsync();
var userDic = await db.Queryable<School>() var userDic = await db.Queryable<School>()
.LeftJoin<Classes>((s, c) => c.SchoolId == s.Id) .LeftJoin<Classes>((s, c) => c.SchoolId == s.Id)
.LeftJoin<Position>((s, c, p) => p.ClassId == c.Id) .LeftJoin<Position>((s, c, p) => p.ClassId == c.Id)
@ -103,6 +106,7 @@ namespace Learn.Archives.API.Controllers
s.Id == school.Id && s.Id == school.Id &&
c.GradeLevel == gradeInfo.GradeLevel && c.GradeLevel == gradeInfo.GradeLevel &&
c.GraduationYear == gradeInfo.GradeYear && c.GraduationYear == gradeInfo.GradeYear &&
u.UserType == UserTypeEnum.学生.GetHashCode() &&
s.Enable && p.Enable && pr.Enable && s.Enable && p.Enable && pr.Enable &&
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState) !p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
.Select((s, c, p, pr, u) => new .Select((s, c, p, pr, u) => new

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

@ -103,7 +103,7 @@ namespace Learn.Archives.API.Controllers
item.AmountRelief = ex.AmountRelief; item.AmountRelief = ex.AmountRelief;
item.ReliefApplication = ex.ReliefApplication; item.ReliefApplication = ex.ReliefApplication;
item.Remark = ex.Remark; item.Remark = ex.Remark;
item.ReliefType = ex.ReliefType.ToString(); item.ReliefType = ex?.ReliefType?.ToString();
item.ReliefSubTime = ex.ReliefSubTime?.ToString("yyyy-MM-dd") ?? string.Empty; item.ReliefSubTime = ex.ReliefSubTime?.ToString("yyyy-MM-dd") ?? string.Empty;
} }