YD/YD_SmartSports.Api
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: YD:726a11dc08939bc9b5459f6608adf1bc5d865dc5
Branches Tags
YD:master
YD:aiapi2.0
YD:dev
..
compare: YD:fada293cd66730aff9e4adde7e2bfba1a474a2ea
Branches Tags
YD:aiapi2.0
YD:dev
YD:master

No commits in common. "726a11dc08939bc9b5459f6608adf1bc5d865dc5" and "fada293cd66730aff9e4adde7e2bfba1a474a2ea" have entirely different histories.
726a11dc08 ... fada293cd6

2 changed files with 15 additions and 16 deletions
Show Stats Expand all files Collapse all files

7
VOL.Business/Services/Training/I_TrainingDataService.cs
View File

@ -2037,11 +2037,10 @@ namespace VOL.Business.Services.Training
public async Task<GetClassReportDetailsModel> GetClassReportDetails(int id) public async Task<GetClassReportDetailsModel> GetClassReportDetails(int id)
{ {
var res = new GetClassReportDetailsModel(); var res = new GetClassReportDetailsModel();
var schoolCode = UserContext.Current.TenantId;
var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>() var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>()
//where hrd.SchoolCode.Equals(UserContext.Current.TenantId) && hrd.ClassRoomRecordId.Equals(id) && hrd.Strength > 0 //where hrd.SchoolCode.Equals(UserContext.Current.TenantId) && hrd.ClassRoomRecordId.Equals(id) && hrd.Strength > 0
where hrd.SchoolCode.Equals(schoolCode) && hrd.ClassRoomRecordId == id where hrd.SchoolCode.Equals(UserContext.Current.TenantId) && hrd.ClassRoomRecordId == id
select hrd; select hrd;
var heartRateDataList = await query.ToListAsync(); var heartRateDataList = await query.ToListAsync();
@ -2050,11 +2049,11 @@ namespace VOL.Business.Services.Training
return res; return res;
var classRoom = await _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>().Include(x => x.ClassroomStudentRecord) var classRoom = await _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>().Include(x => x.ClassroomStudentRecord)
.Where(x => x.SchoolCode == schoolCode && x.Id == id) .Where(x => x.SchoolCode == UserContext.Current.TenantId && x.Id == id)
.FirstAsync(); .FirstAsync();
var classRoomStudent = await _teacherRepository.DbContext.Set<Ai_ClassroomStudentRecord>() var classRoomStudent = await _teacherRepository.DbContext.Set<Ai_ClassroomStudentRecord>()
.Where(x => x.SchoolCode == schoolCode && x.ClassRoomRecordId == id) .Where(x => x.SchoolCode == UserContext.Current.TenantId && x.ClassRoomRecordId == id)
.ToListAsync(); .ToListAsync();
res.GradeAndClass = $"{classRoom.GradeName}-{classRoom.ClassName}"; res.GradeAndClass = $"{classRoom.GradeName}-{classRoom.ClassName}";

24
VOL.WebApi/Startup.cs
View File

@ -318,18 +318,18 @@ namespace VOL.WebApi
//配置HttpContext //配置HttpContext
app.UseStaticHttpContext(); app.UseStaticHttpContext();
app.UseSwagger(); //app.UseSwagger();
app.UseSwaggerUI(c => //app.UseSwaggerUI(c =>
{ //{
//2个下拉框选项 选择对应的文档 // //2个下拉框选项 选择对应的文档
c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api"); // c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api");
c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api"); // c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api");
c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api"); // c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api");
c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api"); // c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api");
c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api"); // c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api");
c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api"); // c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api");
c.RoutePrefix = ""; // c.RoutePrefix = "";
}); //});
app.UseRouting(); app.UseRouting();
app.UseCors(); app.UseCors();