京师提交

This commit is contained in:
tanglong 2026-01-16 10:06:22 +08:00
parent 555e96a396
commit a51fec951a
7 changed files with 171 additions and 17 deletions

View File

@ -54,7 +54,14 @@ namespace VOL.Business.Services.Norm
var res = new PageDataDto<HomeWorkListModel>();
var currentTime = DateTime.Now;
var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == UserContext.Current.TenantId)
string school = "";
if (string.IsNullOrWhiteSpace(paramDto.SchoolCode))
{
school = UserContext.Current.TenantId;
}
var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == school)
select new HomeWorkListModel()
{
WorkId = s.Id,

View File

@ -1996,8 +1996,15 @@ namespace VOL.Business.Services.Training
{
var res = new PageDataDto<ClassReportModel>();
string school = "";
if (string.IsNullOrWhiteSpace(paramDto.SchoolCode))
{
school = UserContext.Current.TenantId;
}
var query = from td in _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>()
where td.SchoolCode.Equals(UserContext.Current.TenantId)
where td.SchoolCode.Equals(school)
select new ClassReportModel()
{
Id = td.Id,
@ -2040,8 +2047,8 @@ namespace VOL.Business.Services.Training
var schoolCode = UserContext.Current.TenantId;
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(schoolCode) && hrd.ClassRoomRecordId == id
where (string.IsNullOrWhiteSpace(schoolCode) || hrd.SchoolCode == schoolCode)
&& hrd.ClassRoomRecordId == id
select hrd;
var heartRateDataList = await query.ToListAsync();
@ -2121,7 +2128,13 @@ namespace VOL.Business.Services.Training
{
var res = new GetStudentClassReportDetailsModel();
var schoolCode = UserContext.Current.TenantId;
string schoolCode = "";
if (string.IsNullOrWhiteSpace(paramDto.SchoolCode))
{
schoolCode = UserContext.Current.TenantId;
}
var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>()
where hrd.SchoolCode == schoolCode &&

View File

@ -15,6 +15,11 @@ namespace VOL.Model.HomeWork
/// </summary>
public class HomeWorkPageListParam : PageDto
{
/// <summary>
/// 学校编号
/// </summary>
public string? SchoolCode { get; set; }
/// <summary>
/// 作业类型
/// </summary>

View File

@ -11,6 +11,11 @@ namespace VOL.Model
/// </summary>
public class ClassReportListParam : PageDto
{
/// <summary>
/// 学校编号
/// </summary>
public string? SchoolCode { get; set; }
/// <summary>
/// 年级Id
/// </summary>

View File

@ -29,6 +29,7 @@ namespace VOL.Model.Training.Response
/// </summary>
public class GetStudentClassReportDetailsDto
{
public string? SchoolCode { get; set; }
/// <summary>
/// 课堂Id
/// </summary>

View File

@ -0,0 +1,123 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using VOL.Business.IServices;
using VOL.Business.IServices.Training;
using VOL.Core.Filters;
using VOL.Core.Utilities;
using VOL.Entity.Enum;
using VOL.Model;
using VOL.Model.HomeWork;
using VOL.Model.Training.Response;
using VOL.System.IRepositories;
using VOL.System.Repositories;
namespace VOL.WebApi.Controllers.JingShiTiJiao
{
[Route("api/[controller]")]
[ApiController]
[ApiExplorerSettings(GroupName = "v3")]
[TypeFilter(typeof(CustomApiResponseFilter))]
[AllowAnonymous]
public class JingShiTiJiaoController : ControllerBase
{
#region 初始化
private readonly IS_HomeWorkService _homeWorkService;
private readonly II_TrainingDataService _trainingDataService;
public JingShiTiJiaoController(
IS_HomeWorkService homeWorkService, II_TrainingDataService trainingDataService)
{
_homeWorkService = homeWorkService;
_trainingDataService = trainingDataService;
}
#endregion
#region 作业
/// <summary>
/// 作业列表
/// </summary>
/// <returns></returns>
[HttpGet(nameof(GetHomeWorkPageList))]
public async Task<PageDataDto<HomeWorkListModel>> GetHomeWorkPageList(HomeWorkPageListParam paramDto)
{
return await _homeWorkService.GetHomeWorkPageList(paramDto);
}
/// <summary>
/// 作业下学生列表
/// </summary>
/// <returns></returns>
[HttpGet(nameof(GetHomeWorkStudents))]
public async Task<PageDataDto<HomeWorkStudentsModel>> GetHomeWorkStudents(HomeWorkStudentsParam paramDto)
{
return await _homeWorkService.GetHomeWorkStudents(paramDto);
}
/// <summary>
/// 作业详情
/// </summary>
/// <returns></returns>
[HttpGet(nameof(GetSubmittedAssignments))]
public async Task<List<SubmittedAssignmentsModel>> GetSubmittedAssignments(int homeWorkId, string studentNo)
{
return await _homeWorkService.GetSubmittedAssignments(homeWorkId, studentNo);
}
#endregion
#region 课堂报告
/// <summary>
/// 课堂报告列表
/// </summary>
/// <returns></returns>
[HttpGet(nameof(GetClassReportList))]
public async Task<PageDataDto<ClassReportModel>> GetClassReportList(ClassReportListParam paramDto)
{
return await _trainingDataService.GetClassReportList(paramDto);
}
/// <summary>
/// 课堂报告详情
/// </summary>
/// <returns></returns>
[HttpGet(nameof(GetClassReportDetails))]
public async Task<GetClassReportDetailsModel> GetClassReportDetails(int id)
{
return await _trainingDataService.GetClassReportDetails(id);
}
/// <summary>
/// 学生课堂报告详情
/// </summary>
/// <returns></returns>
[HttpGet(nameof(GetStudentClassReportDetails))]
public async Task<GetStudentClassReportDetailsModel> GetStudentClassReportDetails(GetStudentClassReportDetailsDto paramDto)
{
return await _trainingDataService.GetStudentClassReportDetails(paramDto);
}
#endregion
/// <summary>
/// 获取所有年级名称
/// </summary>
/// <returns></returns>
[HttpGet(nameof(GetGradeNames))]
public async Task<List<GradeNameModel>> GetGradeNames()
{
}
}
}

View File

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