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

弟弟

Browse Source
This commit is contained in:
tanglong 2025-08-13 10:44:48 +08:00
parent 48fb74a685
commit 0ca6bd0f20
6 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
VOL.Business/Services/HomeWork/S_HomeWorkService.cs
View File

@ -52,6 +52,7 @@ namespace VOL.Business.Services.Norm
public async Task<PageDataDto<HomeWorkListModel>> GetHomeWorkPageList(HomeWorkPageListParam paramDto) public async Task<PageDataDto<HomeWorkListModel>> GetHomeWorkPageList(HomeWorkPageListParam paramDto)
{ {
var res = new PageDataDto<HomeWorkListModel>(); var res = new PageDataDto<HomeWorkListModel>();
var currentTime = DateTime.Now;
var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == UserContext.Current.TenantId) var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == UserContext.Current.TenantId)
select new HomeWorkListModel() select new HomeWorkListModel()
@ -59,11 +60,13 @@ namespace VOL.Business.Services.Norm
WorkId = s.Id, WorkId = s.Id,
TeacherId = s.TeacherId, TeacherId = s.TeacherId,
StudentScope = s.StudentScope, StudentScope = s.StudentScope,
WorkStatus = s.WorkStatus, WorkStatus = s.EndTime < currentTime ? HomeWorkStatus.Ended : (s.StartTime > currentTime ? HomeWorkStatus.NotStarted : HomeWorkStatus.Afoot),
TeacherName = s.TeacherName, TeacherName = s.TeacherName,
WorkName = s.WorkName, WorkName = s.WorkName,
WorkText = s.WorkText, WorkText = s.WorkText,
WorkType = s.WorkType, WorkType = s.WorkType,
WorkModeType = s.WorkModeType,
WorkModeTypeName = s.WorkModeType.GetDescription(),
StartTime = s.StartTime, StartTime = s.StartTime,
EndTime = s.EndTime, EndTime = s.EndTime,
StudentScopeStr = s.StudentScope.GetDescription(), StudentScopeStr = s.StudentScope.GetDescription(),

9
VOL.Entity/Enum/HomeWorkStatus.cs
View File

@ -12,16 +12,21 @@ namespace VOL.Entity.Enum
/// </summary> /// </summary>
public enum HomeWorkStatus public enum HomeWorkStatus
{ {
/// <summary>
/// 未开始
/// </summary>
[Description("未开始")]
NotStarted = 1,
/// <summary> /// <summary>
/// 进行中 /// 进行中
/// </summary> /// </summary>
[Description("进行中")] [Description("进行中")]
Afoot = 1, Afoot = 2,
/// <summary> /// <summary>
/// 已结束 /// 已结束
/// </summary> /// </summary>
[Description("已结束")] [Description("已结束")]
Ended = 2 Ended = 3
} }

2
VOL.Entity/Enum/HomeWorkType.cs
View File

@ -23,6 +23,4 @@ namespace VOL.Entity.Enum
[Description("体育作业")] [Description("体育作业")]
Sports = 2 Sports = 2
} }
} }

10
VOL.Model/HomeWork/Response/HomeWorkListModel.cs
View File

@ -39,6 +39,16 @@ namespace VOL.Model.HomeWork
/// </summary> /// </summary>
public string WorkTypeStr { get; set; } public string WorkTypeStr { get; set; }
/// <summary>
/// 模式类型
/// </summary>
public WorkModeType WorkModeType { get; set; }
/// <summary>
/// 模式类型名称
/// </summary>
public string WorkModeTypeName { get; set; }
/// <summary> /// <summary>
/// 作业状态 /// 作业状态
/// </summary> /// </summary>

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();

4
VOL.WebApi/appsettings.json
View File

@ -19,8 +19,8 @@
//"DbConnectionString": "Data Source=DESKTOP-JJQM2OL\\SQLEXPRESS;Initial Catalog=netcoredev;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;", //"DbConnectionString": "Data Source=DESKTOP-JJQM2OL\\SQLEXPRESS;Initial Catalog=netcoredev;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
//mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20) //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)
//"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;", "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", //"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
//"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;", //"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;",
//"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;", //"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;",