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

33

Browse Source
This commit is contained in:
tl 2025-03-07 16:37:06 +08:00
parent ebc7ab82ab
commit 4a9df4148b
44 changed files with 155 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Server/YD_XinWei.Commons/Utils/Util.cs
View File

@ -116,5 +116,32 @@ namespace YD_XinWei.Commons.Utils
int seconds = totalSeconds.Value % 60;
return $"{minutes}分{seconds}秒";
}
public static int GetRank<T>(this T score) where T : struct, IComparable
{
// 将 score 转换为 double 进行比较
double value = Convert.ToDouble(score);
return value switch
{
>= 90 => 1,
>= 80 => 2,
>= 60 => 3,
_ => 4
};
}
public static string GetRankStr<T>(this T score) where T : struct, IComparable
{
// 将 score 转换为 double 进行比较
double value = Convert.ToDouble(score);
return value switch
{
>= 90 => "优秀",
>= 80 => "良好",
>= 60 => "及格",
_ => "低分"
};
}
}
}

BIN
Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb
View File

Binary file not shown.

2
Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+109d7c5045baf6bc633f73fc42556ea8ad66220d")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ebc7ab82abbd8a95b893e07d82227313fd1dcfdd")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
6da7c6bf0bc6ccfc5303a8d7bf8ed23f75e85e6282e546017922f1ebd475af5a
69a74d53391ffb21bc2e1bf2101ed9868a232f935fc4aa30794ab646a8ceaa46

BIN
Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb
View File

Binary file not shown.

2
Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json
View File

@ -1 +1 @@
{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=a8f22950c2534035c734ca1e96825108a8164bf2&path=/*"}}
{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=ebc7ab82abbd8a95b893e07d82227313fd1dcfdd&path=/*"}}

BIN
Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll
View File

Binary file not shown.

2
Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>C:\Users\Administrator\Desktop\web</_PublishTargetUrl>
<History>True|2025-03-06T02:00:58.4898730Z||;True|2025-03-06T09:59:50.3712985+08:00||;True|2025-03-06T09:03:59.1856247+08:00||;True|2025-03-04T17:35:37.1204893+08:00||;True|2025-03-04T17:18:56.4230027+08:00||;True|2025-03-04T16:59:02.6637491+08:00||;True|2025-03-04T15:21:05.4912749+08:00||;True|2025-03-04T15:08:42.5490957+08:00||;True|2025-03-04T15:01:08.8651148+08:00||;True|2025-03-03T17:31:47.5325183+08:00||;True|2025-03-03T17:09:05.8362354+08:00||;True|2025-03-03T16:41:37.7278763+08:00||;True|2025-03-03T16:34:04.0026009+08:00||;True|2025-03-03T16:24:01.4887542+08:00||;True|2025-03-03T15:24:09.5376627+08:00||;True|2025-03-03T14:32:46.5288364+08:00||;True|2025-03-03T14:18:41.8795454+08:00||;True|2025-03-03T13:39:33.1620349+08:00||;True|2025-03-03T13:13:48.7851364+08:00||;True|2025-03-03T09:48:28.0446948+08:00||;True|2025-03-03T09:47:48.0506237+08:00||;True|2025-03-03T00:03:13.7940731+08:00||;True|2025-03-03T00:00:20.5217808+08:00||;True|2025-02-28T11:24:13.9529058+08:00||;True|2025-02-28T09:52:09.1224260+08:00||;True|2025-02-28T09:09:07.6159508+08:00||;True|2025-02-28T09:03:19.5987556+08:00||;True|2025-02-27T17:59:35.8321576+08:00||;True|2025-02-27T16:51:44.0193039+08:00||;True|2025-02-27T15:48:03.7178463+08:00||;True|2025-02-27T15:39:09.5704225+08:00||;True|2025-02-27T15:39:01.0906094+08:00||;True|2025-02-27T15:35:52.5141530+08:00||;True|2025-02-27T15:22:55.6480561+08:00||;True|2025-02-25T15:05:56.3704383+08:00||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||;</History>
<History>True|2025-03-07T08:31:26.6256757Z||;True|2025-03-07T15:14:30.2549136+08:00||;True|2025-03-07T14:57:41.5400532+08:00||;True|2025-03-07T14:53:16.1364435+08:00||;False|2025-03-07T14:52:47.3342548+08:00||;False|2025-03-07T14:52:10.7452463+08:00||;False|2025-03-07T14:51:33.5424415+08:00||;True|2025-03-07T14:46:55.5807563+08:00||;True|2025-03-07T14:33:04.1266862+08:00||;True|2025-03-07T14:13:22.6999976+08:00||;True|2025-03-07T14:05:09.5133651+08:00||;False|2025-03-07T14:02:23.5093029+08:00||;False|2025-03-07T13:58:37.4496383+08:00||;True|2025-03-07T11:52:20.4578386+08:00||;True|2025-03-07T11:31:43.1972462+08:00||;True|2025-03-07T10:11:26.1562979+08:00||;True|2025-03-07T10:10:59.9440630+08:00||;True|2025-03-07T09:24:15.8595227+08:00||;True|2025-03-06T17:52:31.4924325+08:00||;True|2025-03-06T17:52:19.1631772+08:00||;True|2025-03-06T17:32:57.7195879+08:00||;True|2025-03-06T17:09:15.6877706+08:00||;True|2025-03-06T16:59:48.0866771+08:00||;True|2025-03-06T16:49:15.3348344+08:00||;True|2025-03-06T15:51:10.7923322+08:00||;True|2025-03-06T15:46:02.5442595+08:00||;True|2025-03-06T14:32:36.1899505+08:00||;True|2025-03-06T14:04:43.6692503+08:00||;True|2025-03-06T10:00:58.4898730+08:00||;True|2025-03-06T09:59:50.3712985+08:00||;True|2025-03-06T09:03:59.1856247+08:00||;True|2025-03-04T17:35:37.1204893+08:00||;True|2025-03-04T17:18:56.4230027+08:00||;True|2025-03-04T16:59:02.6637491+08:00||;True|2025-03-04T15:21:05.4912749+08:00||;True|2025-03-04T15:08:42.5490957+08:00||;True|2025-03-04T15:01:08.8651148+08:00||;True|2025-03-03T17:31:47.5325183+08:00||;True|2025-03-03T17:09:05.8362354+08:00||;True|2025-03-03T16:41:37.7278763+08:00||;True|2025-03-03T16:34:04.0026009+08:00||;True|2025-03-03T16:24:01.4887542+08:00||;True|2025-03-03T15:24:09.5376627+08:00||;True|2025-03-03T14:32:46.5288364+08:00||;True|2025-03-03T14:18:41.8795454+08:00||;True|2025-03-03T13:39:33.1620349+08:00||;True|2025-03-03T13:13:48.7851364+08:00||;True|2025-03-03T09:48:28.0446948+08:00||;True|2025-03-03T09:47:48.0506237+08:00||;True|2025-03-03T00:03:13.7940731+08:00||;True|2025-03-03T00:00:20.5217808+08:00||;True|2025-02-28T11:24:13.9529058+08:00||;True|2025-02-28T09:52:09.1224260+08:00||;True|2025-02-28T09:09:07.6159508+08:00||;True|2025-02-28T09:03:19.5987556+08:00||;True|2025-02-27T17:59:35.8321576+08:00||;True|2025-02-27T16:51:44.0193039+08:00||;True|2025-02-27T15:48:03.7178463+08:00||;True|2025-02-27T15:39:09.5704225+08:00||;True|2025-02-27T15:39:01.0906094+08:00||;True|2025-02-27T15:35:52.5141530+08:00||;True|2025-02-27T15:22:55.6480561+08:00||;True|2025-02-25T15:05:56.3704383+08:00||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

156
Server/YD_XinWei/Services/Impl/XinWeiService.cs
View File

@ -150,11 +150,11 @@ namespace YD_XinWei.Api.Services.Impl
foreach (var item in list)
{
var stuList = studentList.Where(x => x.ClassId == item.Id).ToList();
List<SportsRosterStudentDto> sportList = new List<SportsRosterStudentDto>();
List<SportsRosterStudentDto> sportList1 = new List<SportsRosterStudentDto>();
foreach (var sport in stuList)
{
sportList.Add(new SportsRosterStudentDto()
sportList1.Add(new SportsRosterStudentDto()
{
Id = sport.Id,
GroupName = item.Name,
@ -167,7 +167,7 @@ namespace YD_XinWei.Api.Services.Impl
UserName = sport.StudentName,
StudentNo = sport.StudentNo,
UserId = sport.Id,
GroupOrder = 1,
GroupOrder = sport.Id,
RosterId = 1,
});
}
@ -175,10 +175,18 @@ namespace YD_XinWei.Api.Services.Impl
item.RosterGroupList.Add(new SportsRosterGroupDto()
{
GroupName = item.Name,
RosterStudentList = sportList
RosterStudentList = sportList1
});
}
//var list1 = list.Select(x => new SportsRosterDto
//{
// Type = 2
//}).ToList();
//var mergedList = list.Concat(list1).ToList();
return list;
}
@ -279,40 +287,40 @@ namespace YD_XinWei.Api.Services.Impl
scoreRuleDto.Pluses = new List<ScoreRulePlusDto>
{
new ScoreRulePlusDto()
{
Id = grouped.FirstOrDefault()?.Id ?? 0,
Sex = 1,
Max = maleMax,
Min = maleMin,
MaxScore = maleMaxScore,
Score = maleMaxScore
},
new ScoreRulePlusDto()
{
Id = grouped.FirstOrDefault()?.Id ?? 0,
Sex = 2,
Max = femaleMax,
Min = femaleMin,
MaxScore = femaleMaxScore,
Score = femaleMaxScore
}
//new ScoreRulePlusDto()
//{
// Id = grouped.FirstOrDefault()?.Id ?? 0,
// Sex = 1,
// Max = maleMax,
// Min = maleMin,
// MaxScore = maleMaxScore,
// Score = maleMaxScore
//},
//new ScoreRulePlusDto()
//{
// Id = grouped.FirstOrDefault()?.Id ?? 0,
// Sex = 2,
// Max = femaleMax,
// Min = femaleMin,
// MaxScore = femaleMaxScore,
// Score = femaleMaxScore
//}
};
scoreRuleDto.ScoreScopes = new List<ScoreScope>
{
new ScoreScope()
{
Gender = 1,
MaxScore = maleMaxScore,
MaxCount = maleMax
},
new ScoreScope()
{
Gender = 2,
MaxScore = femaleMaxScore,
MaxCount = femaleMax
}
//new ScoreScope()
//{
// Gender = 1,
// MaxScore = maleMaxScore,
// MaxCount = maleMax
//},
//new ScoreScope()
//{
// Gender = 2,
// MaxScore = femaleMaxScore,
// MaxCount = femaleMax
//}
};
res.Add(scoreRuleDto);
@ -345,6 +353,26 @@ namespace YD_XinWei.Api.Services.Impl
stu.Achievement2 = stu.Achievement2 / 10;
}
if (dto.ProjectId == 21)
{
var value = stu.Achievement2;
var standard = healthStandards.Where(x =>
x.CategoryEnum.Equals(categoryEnum) &&
x.GradeId == x.GradeId &&
x.Sex == x.Sex &&
value >= x.MinValue &&
value < x.MaxValue
).FirstOrDefault();
if (standard != null)
{
stu.Score = standard.Score;
stu.Rating = standard.Score.GetRank();
}
}
else
{
var standard = healthStandards.Where(x =>
x.CategoryEnum.Equals(categoryEnum) &&
x.GradeId == x.GradeId &&
@ -356,6 +384,8 @@ namespace YD_XinWei.Api.Services.Impl
if (standard != null)
{
stu.Score = standard.Score;
stu.Rating = standard.Score.GetRank();
}
}
});
@ -399,7 +429,16 @@ namespace YD_XinWei.Api.Services.Impl
string categoryEnum = project?.CategoryEnum ?? "";
var value = data.Achievement;
float value = 0;
if (categoryEnum == "BMI")
{
value = data.Achievement2 ?? 0 / 10;
sportsTestValueEntity.Height = data.Achievement ?? 0 / 10;
sportsTestValueEntity.Weight = data.OriginalAchievement ?? 0 / 100;
}
else
value = data.Achievement ?? 0;
var standard = healthStandards.Where(x =>
x.CategoryEnum.Equals(categoryEnum) &&
@ -429,7 +468,7 @@ namespace YD_XinWei.Api.Services.Impl
sportsTestValueEntity.TeacherName = data.Teacher;
sportsTestValueEntity.StudentNo = data.StudentNo;
sportsTestValueEntity.StudentName = data.StudentName;
sportsTestValueEntity.Value = data.Achievement ?? 0;
sportsTestValueEntity.Value = value;
sportsTestValueEntity.Creator = dto.OrgId ?? 0;
sportsTestValueEntity.CreateDate = nowTime;
sportsTestValueEntity.ScoreTime = Convert.ToDateTime(dto.StartTime);
@ -545,7 +584,7 @@ namespace YD_XinWei.Api.Services.Impl
ClassName = x.ClassName,
CreateTime = x.CreateTime ?? "无数据",
Achievement = x.Achievement.ToString() ?? "无数据",
Rating = x.Rating.ToString() ?? "无数据",
Rating = x.Score.GetRankStr(),
Score = x.Score.ToString() ?? "无数据",
Sex = x.Sex == 1 ? "男" : "女",
StudentName = x.StudentName,
@ -568,29 +607,31 @@ namespace YD_XinWei.Api.Services.Impl
/// <returns></returns>
public async Task<TrainAnalusisVo> TrainAnalysisHistoryDetail(HistoryDetailRequestDto dto)
{
var trainModel = await _sportsContext.XW_TrainStudents.Where(x => x.Id == dto.TrainStudentId).Select(x => new { x.XW_SportsTestDataId, x.StudentId }).FirstAsync();
var trainModel = await _sportsContext.XW_TrainStudents.Where(x => x.Id == dto.TrainStudentId).Select(x => new { x.XW_SportsTestDataId, x.StudentId, x.GradeId }).FirstAsync();
var stuHeadUrl = await _sportsContext.Student.Where(x => x.Id == trainModel.StudentId).Select(x => x.Photo).FirstOrDefaultAsync();
var trainName = await _sportsContext.XW_SportsTestData.Where(x => x.Id == trainModel.XW_SportsTestDataId).Select(x => x.ProjectName).FirstOrDefaultAsync();
var train = await _sportsContext.XW_SportsTestData.Where(x => x.Id == trainModel.XW_SportsTestDataId).Select(x => new { x.ProjectName, x.ProjectId }).FirstOrDefaultAsync();
var now = DateTime.UtcNow;
var firstDayOfMonth = new DateTime(now.Year, now.Month, 1);
var lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddDays(-1);
var trainIds = await _sportsContext.XW_SportsTestData.Where(x => x.ProjectId == train.ProjectId).Select(x => x.Id).ToListAsync();
var studentResults = await _sportsContext.XW_TrainStudents.Where(x => x.XW_SportsTestDataId == trainModel.XW_SportsTestDataId)
var studentResults = await _sportsContext.XW_TrainStudents.Where(x => trainIds.Contains(x.XW_SportsTestDataId))
.Select(x => new
{
x.Id,
x.GradeId,
x.StudentId,
x.StudentName,
x.Rating,
x.CreateTime,
x.Score
x.Score,
x.Achievement
}).ToListAsync();
var student = studentResults.FirstOrDefault(x => x.StudentId == trainModel.StudentId);
var student = studentResults.Where(x => x.Id == dto.TrainStudentId).OrderByDescending(x => x.Achievement).FirstOrDefault();
if (student == null)
{
@ -601,11 +642,11 @@ namespace YD_XinWei.Api.Services.Impl
.Where(x => x.GradeId == student.GradeId &&
DateTime.TryParse(x.CreateTime, out var createTime) &&
createTime >= firstDayOfMonth && createTime <= lastDayOfMonth)
.OrderByDescending(x => x.Score)
.Select((x, index) => new { x.StudentId, Rank = index + 1 })
.OrderByDescending(x => x.Achievement)
.Select((x, index) => new { x.Id, Rank = index + 1 })
.ToList();
var studentRank = rankedResults.FirstOrDefault(x => x.StudentId == student.StudentId)?.Rank.ToString() ?? "无数据";
var studentRank = rankedResults.FirstOrDefault(x => x.Id == dto.TrainStudentId)?.Rank.ToString() ?? "无数据";
var res = await _sportsContext.XW_TrainStudents.Where(x => x.Id == dto.TrainStudentId).Include(x => x.TrainViolationsBO).Select(x => new TrainAnalusisVo()
{
@ -613,8 +654,8 @@ namespace YD_XinWei.Api.Services.Impl
ClassName = x.ClassName,
GradeRanking = studentRank,
HeadImgUrl = stuHeadUrl,
ProjectName = trainName,
Rating = x.Rating.ToString() ?? "无数据",
ProjectName = train.ProjectName,
Rating = x.Score.GetRankStr(),
Score = x.Score.ToString() ?? "无数据",
Sex = x.Sex == 1 ? "男" : "女",
StudentName = x.StudentName,
@ -632,8 +673,6 @@ namespace YD_XinWei.Api.Services.Impl
}).FirstOrDefaultAsync();
return res;
}
@ -663,10 +702,11 @@ namespace YD_XinWei.Api.Services.Impl
x.GradeId,
x.Sex,
x.Score,
x.Achievement,
x.CreateTime
}).ToListAsync();
var student = studentResults.FirstOrDefault(x => x.StudentId == dto.StudentId);
var student = studentResults.Where(x => x.StudentId == dto.StudentId).OrderByDescending(x => x.Achievement).FirstOrDefault();
if (student == null)
{
@ -674,13 +714,13 @@ namespace YD_XinWei.Api.Services.Impl
}
var rankedResults = studentResults.Where(x => x.GradeId == student.GradeId)
.OrderByDescending(x => x.Score)
.OrderByDescending(x => x.Achievement)
.Select((x, index) => new { x, Rank = index + 1 })
.ToList();
var monthList = studentResults.Where(x => DateTime.TryParse(x.CreateTime, out var date) && date.Year == DateTime.Now.Year && date.Month == DateTime.Now.Month).ToList();
var monthRankedResults = studentResults.Where(x => x.GradeId == student.GradeId)
.OrderByDescending(x => x.Score)
.OrderByDescending(x => x.Achievement)
.Select((x, index) => new { x, Rank = index + 1 })
.ToList();
@ -692,10 +732,10 @@ namespace YD_XinWei.Api.Services.Impl
HeadImgUrl = stuHeadUrl,
Sex = student.Sex == 1 ? "男" : "女",
StudentName = student.StudentName,
HistoryBestScore = studentResults.Max(x => x.Score)?.ToString() ?? "无数据",
HistoryRanking = rankedResults.FirstOrDefault(x => x.x.Score == student.Score)?.Rank.ToString() ?? "-1",
MonthBestScore = monthList.Max(x => x.Score)?.ToString() ?? "无数据",
MonthRanking = monthRankedResults.FirstOrDefault(x => x.x.Score == student.Score)?.Rank.ToString() ?? "-1"
HistoryBestScore = studentResults.Max(x => x.Achievement).ToString() ?? "无数据",
HistoryRanking = rankedResults.FirstOrDefault(x => x.x.Achievement == student.Achievement)?.Rank.ToString() ?? "-1",
MonthBestScore = monthList.Max(x => x.Achievement).ToString() ?? "无数据",
MonthRanking = monthRankedResults.FirstOrDefault(x => x.x.Achievement == student.Achievement)?.Rank.ToString() ?? "-1"
};
return res;
@ -750,7 +790,7 @@ namespace YD_XinWei.Api.Services.Impl
ClassName = x.ClassName,
CreateTime = x.CreateTime ?? "无数据",
Achievement = x.Achievement.ToString() ?? "无数据",
Rating = x.Rating.ToString() ?? "无数据",
Rating = x.Score.GetRankStr(),
Score = x.Score.ToString() ?? "无数据",
Sex = x.Sex == 1 ? "男" : "女",
StudentName = x.StudentName,

2
Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs
View File

@ -163,7 +163,7 @@ namespace VOL.Entity.DomainModels.XinWei
/// </summary>
[Display(Name = "Score")]
[Comment("得分")]
public double? Score { get; set; }
public double Score { get; set; }
/// <summary>
/// 加分项得分

BIN
Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb
View File

Binary file not shown.

2
Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+109d7c5045baf6bc633f73fc42556ea8ad66220d")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ebc7ab82abbd8a95b893e07d82227313fd1dcfdd")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
57e0bf9ea8468ac4f7c3fd9737bb7b131c7ead35c0a8892a38514c98655ba4b9
10b99e6335eba19cca04c07ce5a2d225e8e3d58fcfb1a6e9666a7d8f492d66f6

7
Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cs
View File

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------

BIN
Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb
View File

Binary file not shown.

2
Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json
View File

@ -1 +1 @@
{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=109d7c5045baf6bc633f73fc42556ea8ad66220d&path=/*"}}
{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=ebc7ab82abbd8a95b893e07d82227313fd1dcfdd&path=/*"}}

BIN
Server/YD_XinWei/obj/Debug/net6.0/apphost.exe
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb
View File

Binary file not shown.

2
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+109d7c5045baf6bc633f73fc42556ea8ad66220d")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ebc7ab82abbd8a95b893e07d82227313fd1dcfdd")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
57e0bf9ea8468ac4f7c3fd9737bb7b131c7ead35c0a8892a38514c98655ba4b9
10b99e6335eba19cca04c07ce5a2d225e8e3d58fcfb1a6e9666a7d8f492d66f6

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
View File

Binary file not shown.

2
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json
View File

@ -1 +1 @@
{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=109d7c5045baf6bc633f73fc42556ea8ad66220d&path=/*"}}
{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=ebc7ab82abbd8a95b893e07d82227313fd1dcfdd&path=/*"}}

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll
View File

Binary file not shown.

BIN
Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll
View File

Binary file not shown.