update:学生端课堂报告&体测报告优化
This commit is contained in:
parent
0019004465
commit
b8d9670953
@ -186,7 +186,10 @@ namespace YD_WeChatApplet.Api.Services.Impl
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<StudentReportDto> StudentReport(string? studentNo)
|
public async Task<StudentReportDto> StudentReport(string? studentNo)
|
||||||
{
|
{
|
||||||
var res = new StudentReportDto();
|
var res = new StudentReportDto
|
||||||
|
{
|
||||||
|
CategoryScoreList = new List<CategoryScoreDto>()
|
||||||
|
};
|
||||||
|
|
||||||
// 若参数为空,则尝试从登录上下文获取当前用户编号
|
// 若参数为空,则尝试从登录上下文获取当前用户编号
|
||||||
if (string.IsNullOrWhiteSpace(studentNo))
|
if (string.IsNullOrWhiteSpace(studentNo))
|
||||||
@ -272,8 +275,6 @@ namespace YD_WeChatApplet.Api.Services.Impl
|
|||||||
ScoreTime = x.ScoreTime
|
ScoreTime = x.ScoreTime
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
res.CategoryScoreList = new List<CategoryScoreDto>();
|
|
||||||
|
|
||||||
foreach (var item in categorys)
|
foreach (var item in categorys)
|
||||||
{
|
{
|
||||||
// ✅ 当前学生数据
|
// ✅ 当前学生数据
|
||||||
@ -327,11 +328,11 @@ namespace YD_WeChatApplet.Api.Services.Impl
|
|||||||
|
|
||||||
res.CategoryScoreList.Add(new CategoryScoreDto()
|
res.CategoryScoreList.Add(new CategoryScoreDto()
|
||||||
{
|
{
|
||||||
CategoryValue = item.CategoryValue,
|
CategoryValue = item.Id,
|
||||||
Name = item.CategoryName,
|
Name = item.CategoryName,
|
||||||
|
|
||||||
Rank = lastResult?.Rank,
|
Rank = lastResult?.Rank,
|
||||||
GradeId = lastResult.GradeId,
|
GradeId = lastResult?.GradeId,
|
||||||
|
|
||||||
PrevScore = prevResult?.Score ?? 0,
|
PrevScore = prevResult?.Score ?? 0,
|
||||||
LastScore = lastResult?.Score ?? 0,
|
LastScore = lastResult?.Score ?? 0,
|
||||||
@ -340,7 +341,7 @@ namespace YD_WeChatApplet.Api.Services.Impl
|
|||||||
//ClassAvgScore = (float)classAvgScore,
|
//ClassAvgScore = (float)classAvgScore,
|
||||||
SchoolAvgScore = (float)schoolAvgScore,
|
SchoolAvgScore = (float)schoolAvgScore,
|
||||||
|
|
||||||
ScoreTrendChart = trendChart,
|
ScoreTrendChart = trendChart ?? new ScoreTrendChartDataDto { AxisX = new List<string>(), AxisY = new List<float>() },
|
||||||
|
|
||||||
ImgUrl = $"{AppSettings.ALiYunOSS.CategoryImgUrl}{item.CategoryEnum}.png"
|
ImgUrl = $"{AppSettings.ALiYunOSS.CategoryImgUrl}{item.CategoryEnum}.png"
|
||||||
});
|
});
|
||||||
|
|||||||
@ -14,7 +14,7 @@ namespace YD_WeChatApplet.Commons.Dto.Patriarch
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 各项目得分
|
/// 各项目得分
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<CategoryScoreDto> CategoryScoreList { get; set; }
|
public List<CategoryScoreDto> CategoryScoreList { get; set; } = new List<CategoryScoreDto>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -30,7 +30,7 @@ namespace YD_WeChatApplet.Commons.Dto.Patriarch
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目名称
|
/// 项目名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Name { get; set; }
|
public string Name { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 上一次得分
|
/// 上一次得分
|
||||||
@ -60,12 +60,12 @@ namespace YD_WeChatApplet.Commons.Dto.Patriarch
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 图片地址
|
/// 图片地址
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string ImgUrl { get; set; }
|
public string ImgUrl { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 等级
|
/// 等级
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Rank { get; set; }
|
public string Rank { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///年级Id
|
///年级Id
|
||||||
@ -75,7 +75,7 @@ namespace YD_WeChatApplet.Commons.Dto.Patriarch
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 成绩趋势图
|
/// 成绩趋势图
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ScoreTrendChartDataDto ScoreTrendChart { get; set; }
|
public ScoreTrendChartDataDto ScoreTrendChart { get; set; } = new ScoreTrendChartDataDto();
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ScoreTrendChartDataDto
|
public class ScoreTrendChartDataDto
|
||||||
@ -83,11 +83,11 @@ namespace YD_WeChatApplet.Commons.Dto.Patriarch
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// X轴
|
/// X轴
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<string> AxisX { get; set; }
|
public List<string> AxisX { get; set; } = new List<string>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Y轴
|
/// Y轴
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<float> AxisY { get; set; }
|
public List<float> AxisY { get; set; } = new List<float>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user