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
Pu$`Iil@|9c%+2IKhW&EJ
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
index c8d8b02..194a26f 100644
--- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
+++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
@@ -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+a425fcc1a41944f64a69d9b5ababdd07169c6a0d")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f9f4a53c41a5029c82bfb442fd4e2b9f2980218f")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
index bf2b749..5cf0c7f 100644
--- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
@@ -1 +1 @@
-ccb578c866c97170d1abbe168fb35ec821458a73a52b86c4e9d961def395e327
+1a65a50200bd94af6e2d6f3826d955a8c36d582414a4f0b14ef8b8181a24901d
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
index 362d4bb..34d2c7e 100644
--- a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
+++ b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+782af8743bef71ca7e5f90325feac2f11e237ba5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f9f4a53c41a5029c82bfb442fd4e2b9f2980218f")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
index f6b11bb..a254bd8 100644
--- a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
@@ -1 +1 @@
-69251adfa64a9b3b7fb3d391959c24ebf8b50dfa3951efbe3b21fe9890d5cf9d
+74c4dd81c8aa3b83c88922809ca51fe25d7816fdf64b1c08a9bf0d7628572ab1
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.dll
index 1029c2cabe2ce79792ee6e92fd607cd8b1548f5f..5a694e9001f14344775678c91a4213840b373dbb 100644
GIT binary patch
delta 247
zcmZpez}7Hq7TNov!C7GBQrKOmp8YNk#8ChBw7#UimZLh0l{Kd?&^Zbwf(`)J(
z0|cI~FXFa8$L+lE$NW`p3Re8n@6D`O)Q0NYSbdH?_b
delta 247
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
Pu$`Iil@|9c%+2IKhW&EJ
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/ref/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Release/net6.0/ref/YD_XinWei.Commons.dll
index d17e27da6ac41921ad07b6f31c6604a649c70a4e..0bd1f5a2d301c8770a0ad500f335b4160f9180a8 100644
GIT binary patch
delta 197
zcmZqp!rbtMc|r%v3ZY4}H};e;3lwzJZf7ZK_n5p_FTSbu>(sdcNU|zRQxx;;j#IZN6<5WO>iH`9Evp15Bw2
z&#Krp%q@%((=5zQjFVE+%ng$h%~MU&EDel}Ow&>mla1004O5Mb&65&MHygeC$Kh|z
zV8LL-kjRh*q|F&j7>pT`7*c^ea|T0(WT3b?kY@_yTQV2`<&41WRG@e=kevopV+fQt
S0?L>J^(8WxZm$2{$OHgtJU$fw
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/refint/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Release/net6.0/refint/YD_XinWei.Commons.dll
index d17e27da6ac41921ad07b6f31c6604a649c70a4e..0bd1f5a2d301c8770a0ad500f335b4160f9180a8 100644
GIT binary patch
delta 197
zcmZqp!rbtMc|r%v3ZY4}H};e;3lwzJZf7ZK_n5p_FTSbu>(sdcNU|zRQxx;;j#IZN6<5WO>iH`9Evp15Bw2
z&#Krp%q@%((=5zQjFVE+%ng$h%~MU&EDel}Ow&>mla1004O5Mb&65&MHygeC$Kh|z
zV8LL-kjRh*q|F&j7>pT`7*c^ea|T0(WT3b?kY@_yTQV2`<&41WRG@e=kevopV+fQt
S0?L>J^(8WxZm$2{$OHgtJU$fw
diff --git a/Server/YD_XinWei/AutoMappers/MappingProfile.cs b/Server/YD_XinWei/AutoMappers/MappingProfile.cs
index 19d2e6d..6f1d056 100644
--- a/Server/YD_XinWei/AutoMappers/MappingProfile.cs
+++ b/Server/YD_XinWei/AutoMappers/MappingProfile.cs
@@ -23,6 +23,7 @@ namespace YD_XinWei.Api.AutoMappers
CreateMap();
CreateMap();
+
CreateMap();
CreateMap();
}
diff --git a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs
index 92f7250..8d91cb0 100644
--- a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs
+++ b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs
@@ -106,6 +106,33 @@ namespace YD_XinWei.Api.Services.Impl
res.BasicInfo.FemaleCount = studentList.Count(x => x.Sex == 2);
res.BasicInfo.MaleCount = studentList.Count(x => x.Sex == 1);
+ //var sportsTestData = _caching.Get>(sportsTestDataKey);
+
+ //if (sportsTestData == null || sportsTestData.Count == 0)
+ //{
+ // sportsTestData = await _sportsContext.SportsTestValue.Where(x => x.SchoolCode == schoolCode && x.DataSource == DataSource.XW)
+ // .Select(x => new SportsTestDataDto()
+ // {
+ // SchoolCode = x.SchoolCode,
+ // CategoryValue = x.CategoryValue,
+ // ClassId = x.ClassId,
+ // ClassName = x.ClassName,
+ // GradeId = x.GradeId,
+ // GradeName = x.GradeName,
+ // TeacherId = x.TeacherId,
+ // StudentNo = x.StudentNo,
+ // StudentName = x.StudentName,
+ // Sex = x.Sex,
+ // ScoreTime = x.ScoreTime,
+ // Height = x.Height,
+ // Weight = x.Weight,
+ // Value = x.Value,
+ // Score = x.Score,
+ // Rank = x.Rank
+ // }).ToListAsync();
+ // //_caching.AddObject(sportsTestDataKey, sportsTestData, 60);
+ //}
+
var sportsTestData = _caching.Get>(sportsTestDataKey);
if (sportsTestData == null || sportsTestData.Count == 0)
diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs
index 60093cd..bcb10f9 100644
--- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs
+++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs
@@ -16,6 +16,7 @@ using YD_XinWei.Commons.Utils;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
using Newtonsoft.Json.Linq;
using VOL.Entity.Enum;
+using System.Text.Json;
namespace YD_XinWei.Api.Services.Impl
{
@@ -337,12 +338,27 @@ namespace YD_XinWei.Api.Services.Impl
///
public async Task AddTrain(AddTrainDto dto)
{
+ var jsonOptions = new JsonSerializerOptions
+ {
+ WriteIndented = true,
+ Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+ };
+
+ string dtoJson = System.Text.Json.JsonSerializer.Serialize(dto, jsonOptions);
+
+ await File.WriteAllTextAsync(
+ $"/tmp/add_train_{DateTime.Now:yyyyMMdd_HHmmss}.json",
+ dtoJson
+ );
+
var xwProject = await _sportsContext.XW_TestingProject.ToListAsync();
var healthStandards = await _sportsContext.HealthStandards.ToListAsync();
try
{
- dto.StudentList.ForEach(stu =>
+ var entity = _mapper.Map(dto);
+
+ entity.StudentList.ForEach(stu =>
{
var project = xwProject.Where(x => x.ProjectId == dto.ProjectId).FirstOrDefault();
string categoryEnum = project?.CategoryEnum ?? "";
@@ -396,7 +412,6 @@ namespace YD_XinWei.Api.Services.Impl
dto.StudentList.ForEach(x => { x.OrgId = dto.OrgId; });
- var entity = _mapper.Map(dto);
await _sportsContext.XW_SportsTestData.AddAsync(entity);
var sportsTestValueEntinys = await AddSportsTestValueEntity(dto, healthStandards, xwProject);
@@ -441,14 +456,18 @@ namespace YD_XinWei.Api.Services.Impl
if (categoryEnum == "BMI")
{
- value = (data.Achievement2 ?? 0) / 10;
- sportsTestValueEntity.Height = (data.Achievement ?? 0) / 10;
- sportsTestValueEntity.Weight = (data.OriginalAchievement ?? 0) / 100;
+ value = (float)Math.Round((data.Achievement2 ?? 0) / 10.0, 2);
+ sportsTestValueEntity.Height = (float)Math.Round((data.Achievement ?? 0) / 10.0, 2);
+ sportsTestValueEntity.Weight = (float)Math.Round((data.OriginalAchievement ?? 0) / 100.0, 2);
}
+
+
else if (categoryEnum == "MeterRun_50")
{
- value = (data.Achievement ?? 0) / 1000;
+ value = (float)Math.Round((data.Achievement ?? 0) / 1000.0, 3);
}
+
+
else
value = data.Achievement ?? 0;
diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs
index d5217ca..e867d90 100644
--- a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs
+++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs
@@ -51,7 +51,7 @@ namespace VOL.Entity.DomainModels.XinWei
///