提交
This commit is contained in:
parent
18ba6640a2
commit
24d9cd854d
@ -147,10 +147,10 @@ namespace VOL.Ai.Services
|
|||||||
//if (res == null)
|
//if (res == null)
|
||||||
// return new Ai_SchoolDto();
|
// return new Ai_SchoolDto();
|
||||||
|
|
||||||
var res = new Ai_SchoolDto();
|
|
||||||
|
|
||||||
var schoolCode = paramDto.Code;
|
var schoolCode = paramDto.Code;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// =========================
|
// =========================
|
||||||
// 2️⃣ 调用京师接口获取学校年级班级
|
// 2️⃣ 调用京师接口获取学校年级班级
|
||||||
// =========================
|
// =========================
|
||||||
@ -159,6 +159,15 @@ namespace VOL.Ai.Services
|
|||||||
if (schoolClass?.Grades == null || !schoolClass.Grades.Any())
|
if (schoolClass?.Grades == null || !schoolClass.Grades.Any())
|
||||||
throw new Exception("获取京师年级班级失败!");
|
throw new Exception("获取京师年级班级失败!");
|
||||||
|
|
||||||
|
var res = new Ai_SchoolDto()
|
||||||
|
{
|
||||||
|
SchoolCode = schoolCode,
|
||||||
|
Name = schoolClass.SchoolName,
|
||||||
|
Type = 1,
|
||||||
|
Province = "",
|
||||||
|
City = ""
|
||||||
|
};
|
||||||
|
|
||||||
var gradeDtos = schoolClass.Grades;
|
var gradeDtos = schoolClass.Grades;
|
||||||
|
|
||||||
// =========================
|
// =========================
|
||||||
@ -1069,7 +1078,7 @@ namespace VOL.Ai.Services
|
|||||||
SportsItem = AppSetting.JingShiTiJiao.SportsItem,
|
SportsItem = AppSetting.JingShiTiJiao.SportsItem,
|
||||||
SportsDate = hr.ScoreTime.ToString("yyyy-MM-dd"),
|
SportsDate = hr.ScoreTime.ToString("yyyy-MM-dd"),
|
||||||
SportsService = AppSetting.JingShiTiJiao.Channel,
|
SportsService = AppSetting.JingShiTiJiao.Channel,
|
||||||
SportsScene = "HeartRate",
|
SportsScene = "HeartRate",
|
||||||
SportsDetail = JsonConvert.SerializeObject(hr)
|
SportsDetail = JsonConvert.SerializeObject(hr)
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
@ -1144,7 +1153,7 @@ namespace VOL.Ai.Services
|
|||||||
SportsItem = AppSetting.JingShiTiJiao.SportsItem,
|
SportsItem = AppSetting.JingShiTiJiao.SportsItem,
|
||||||
SportsDate = d.ScoreTime.ToString("yyyy-MM-dd"),
|
SportsDate = d.ScoreTime.ToString("yyyy-MM-dd"),
|
||||||
SportsService = AppSetting.JingShiTiJiao.Channel,
|
SportsService = AppSetting.JingShiTiJiao.Channel,
|
||||||
SportsScene = "FastJumpRope",
|
SportsScene = "FastJumpRope",
|
||||||
SportsDetail = JsonConvert.SerializeObject(d)
|
SportsDetail = JsonConvert.SerializeObject(d)
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
@ -1304,7 +1313,7 @@ namespace VOL.Ai.Services
|
|||||||
|
|
||||||
var teacher = await _classRepository.DbContext.Set<JS_Teacher>().Where(x => x.Id == paramDto.TeacherId).FirstOrDefaultAsync();
|
var teacher = await _classRepository.DbContext.Set<JS_Teacher>().Where(x => x.Id == paramDto.TeacherId).FirstOrDefaultAsync();
|
||||||
|
|
||||||
if (teacher==null)
|
if (teacher == null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("未找到老师信息");
|
Console.WriteLine("未找到老师信息");
|
||||||
return new Ai_ClassRoomRecordDto();
|
return new Ai_ClassRoomRecordDto();
|
||||||
@ -1615,12 +1624,13 @@ namespace VOL.Ai.Services
|
|||||||
Id = (int)tId,
|
Id = (int)tId,
|
||||||
TeacherName = teacher.TeacherName,
|
TeacherName = teacher.TeacherName,
|
||||||
Phone = teacher.TeacherNo,
|
Phone = teacher.TeacherNo,
|
||||||
|
//Photo = teacher.TeacherNo,
|
||||||
GradeAndClassList = dbGrades
|
GradeAndClassList = dbGrades
|
||||||
.SelectMany(g => g.Classes)
|
.SelectMany(g => g.Classes)
|
||||||
.Select(c => new Classes
|
.Select(c => new Classes
|
||||||
{
|
{
|
||||||
Id = (int)c.Id,
|
Id = (int)c.Id,
|
||||||
Name = $"{c.GradeName}-{c.ClassName}"
|
Name = $"{c.GradeName}-{c.ClassName}"
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
};
|
};
|
||||||
@ -1629,7 +1639,7 @@ namespace VOL.Ai.Services
|
|||||||
// 7️⃣ 删除扫码记录
|
// 7️⃣ 删除扫码记录
|
||||||
// =========================
|
// =========================
|
||||||
_scanCodeLoginRepository.Delete(loginInfo);
|
_scanCodeLoginRepository.Delete(loginInfo);
|
||||||
await _scanCodeLoginRepository.SaveChangesAsync();
|
//await _scanCodeLoginRepository.SaveChangesAsync();
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user