2026-03-27 10:53:02 +08:00
|
|
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
|
|
using VOL.Entity.DomainModels.XinWei;
|
|
|
|
|
|
using YD_YiLu.Api.Context;
|
|
|
|
|
|
using YD_YiLu.Api.Services.Interface;
|
|
|
|
|
|
using YD_YiLu.Api.SmartSportsEntitys;
|
2026-04-08 16:09:51 +08:00
|
|
|
|
using YD_YiLu.Commons;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
using YD_YiLu.Commons.Dto.DeviceSync;
|
|
|
|
|
|
using YD_YiLu.Commons.Utils;
|
|
|
|
|
|
|
|
|
|
|
|
namespace YD_YiLu.Api.Services.Impl
|
|
|
|
|
|
{
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 壹动站/壹体屏/活力课间屏 设备同步服务实现
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public class DeviceSyncService : IDeviceSyncService
|
|
|
|
|
|
{
|
|
|
|
|
|
private readonly SmartSportsContext _context;
|
|
|
|
|
|
|
|
|
|
|
|
public DeviceSyncService(SmartSportsContext context)
|
|
|
|
|
|
{
|
|
|
|
|
|
_context = context;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<int?> GetOrgIdByDeviceAsync(string deviceSerial)
|
|
|
|
|
|
{
|
2026-04-02 13:53:26 +08:00
|
|
|
|
var device = await _context.YL_Device.FirstOrDefaultAsync(x => x.SerialNumber == deviceSerial);
|
|
|
|
|
|
if (device?.OrgId != null)
|
|
|
|
|
|
return device.OrgId;
|
|
|
|
|
|
else return 0;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<DeviceSyncUserPageResponseDto> UserPageAsync(DeviceSyncUserPageRequestDto dto)
|
|
|
|
|
|
{
|
|
|
|
|
|
var orgId = await GetOrgIdByDeviceAsync(dto.DeviceSerial);
|
|
|
|
|
|
if (!orgId.HasValue) return new DeviceSyncUserPageResponseDto();
|
|
|
|
|
|
|
|
|
|
|
|
string schoolCode = await _context.School.Where(x => x.Id == orgId).Select(x => x.SchoolCode).FirstAsync();
|
|
|
|
|
|
var query = _context.Student.Where(x => x.SchoolCode == schoolCode);
|
|
|
|
|
|
|
2026-04-02 13:53:26 +08:00
|
|
|
|
//if (dto.UserType == 1) query = query.Where(x => false);
|
|
|
|
|
|
//else if (dto.UserType == 2) { }
|
|
|
|
|
|
//else if (dto.UserType == 3) query = query.Where(x => false);
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
|
|
|
|
|
var total = await query.CountAsync();
|
|
|
|
|
|
var pageIndex = dto.PageIndex < 1 ? 1 : dto.PageIndex;
|
|
|
|
|
|
var fullSync = dto.FullSync || dto.PageSize <= 0;
|
|
|
|
|
|
var pageSize = fullSync ? total : (dto.PageSize <= 0 ? 10 : dto.PageSize);
|
|
|
|
|
|
var listQuery = query.OrderBy(x => x.Id);
|
|
|
|
|
|
if (!fullSync)
|
|
|
|
|
|
listQuery = (IOrderedQueryable<S_Student>)listQuery.Skip((pageIndex - 1) * pageSize).Take(pageSize);
|
|
|
|
|
|
var list = await listQuery
|
|
|
|
|
|
.Select(s => new DeviceSyncUserDto
|
|
|
|
|
|
{
|
|
|
|
|
|
UserId = s.Id,
|
|
|
|
|
|
UserType = 2,
|
|
|
|
|
|
Username = s.StudentNo,
|
|
|
|
|
|
Nickname = s.StudentName,
|
|
|
|
|
|
GradeName = "",
|
2026-04-02 13:53:26 +08:00
|
|
|
|
OrganizationId = s.Id,
|
|
|
|
|
|
OrganizationName = s.ClassName ?? "",
|
2026-03-27 10:53:02 +08:00
|
|
|
|
FacePictureUrl = s.Photo ?? "",
|
|
|
|
|
|
Identity = "学生",
|
|
|
|
|
|
Gender = s.Sex == 1 ? "男" : "女",
|
|
|
|
|
|
Birthday = s.Birthday.HasValue ? s.Birthday.Value.ToString("yyyy-MM-dd") : "",
|
2026-04-02 13:53:26 +08:00
|
|
|
|
UserSerial = s.StudentNo,
|
2026-03-27 10:53:02 +08:00
|
|
|
|
})
|
|
|
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var u in list)
|
|
|
|
|
|
{
|
|
|
|
|
|
var c = await _context.Class.FindAsync(u.OrganizationId);
|
|
|
|
|
|
if (c != null)
|
|
|
|
|
|
{
|
|
|
|
|
|
u.OrganizationName = c.ClassName ?? "";
|
|
|
|
|
|
u.GradeName = c.GradeName ?? "";
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return new DeviceSyncUserPageResponseDto
|
|
|
|
|
|
{
|
|
|
|
|
|
SyncId = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
|
|
|
|
|
|
Current = fullSync ? 1 : pageIndex,
|
|
|
|
|
|
Pages = fullSync ? 1 : (total == 0 ? 0 : (int)Math.Ceiling(total / (double)Math.Max(pageSize, 1))),
|
|
|
|
|
|
Total = total,
|
|
|
|
|
|
UserList = list
|
|
|
|
|
|
};
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<DeviceSyncUserPageResponseDto> UserSyncAsync(string deviceSerial, int deviceType, int userType)
|
|
|
|
|
|
{
|
|
|
|
|
|
return await UserPageAsync(new DeviceSyncUserPageRequestDto
|
|
|
|
|
|
{
|
|
|
|
|
|
DeviceSerial = deviceSerial,
|
|
|
|
|
|
DeviceType = deviceType,
|
|
|
|
|
|
UserType = userType,
|
|
|
|
|
|
PageIndex = 1,
|
|
|
|
|
|
FullSync = true,
|
|
|
|
|
|
PageSize = 0
|
|
|
|
|
|
});
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<List<DeviceSyncOrganizationDto>> OrganizationAsync(DeviceSyncOrganizationRequestDto dto)
|
|
|
|
|
|
{
|
|
|
|
|
|
var orgId = await GetOrgIdByDeviceAsync(dto.DeviceSerial);
|
|
|
|
|
|
if (!orgId.HasValue) return new List<DeviceSyncOrganizationDto>();
|
|
|
|
|
|
|
|
|
|
|
|
string schoolCode = await _context.School.Where(x => x.Id == orgId).Select(x => x.SchoolCode).FirstAsync();
|
|
|
|
|
|
var grades = await _context.Grade.Where(x => x.SchoolCode == schoolCode).OrderBy(x => x.Id).ToListAsync();
|
|
|
|
|
|
var classes = await _context.Class.Where(x => x.SchoolCode == schoolCode).ToListAsync();
|
|
|
|
|
|
|
|
|
|
|
|
var result = new List<DeviceSyncOrganizationDto>();
|
|
|
|
|
|
foreach (var g in grades)
|
|
|
|
|
|
{
|
|
|
|
|
|
var gradeClasses = classes.Where(x => x.GradeId == g.Id).ToList();
|
|
|
|
|
|
result.Add(new DeviceSyncOrganizationDto
|
|
|
|
|
|
{
|
|
|
|
|
|
OrganizationId = g.Id,
|
|
|
|
|
|
ParentId = 0,
|
|
|
|
|
|
ParentName = null,
|
|
|
|
|
|
OrganizationName = g.GradeName,
|
|
|
|
|
|
OrganizationType = "年级",
|
|
|
|
|
|
Children = gradeClasses.Select(c => new DeviceSyncOrganizationDto
|
|
|
|
|
|
{
|
|
|
|
|
|
OrganizationId = c.Id,
|
|
|
|
|
|
ParentId = g.Id,
|
|
|
|
|
|
ParentName = g.GradeName,
|
|
|
|
|
|
OrganizationName = c.ClassName ?? "",
|
|
|
|
|
|
OrganizationType = "班级",
|
|
|
|
|
|
ChildrenIds = new List<int>()
|
|
|
|
|
|
}).ToList(),
|
|
|
|
|
|
ChildrenIds = gradeClasses.Select(x => x.Id).ToList()
|
|
|
|
|
|
});
|
|
|
|
|
|
}
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<List<DeviceSyncTrainPushResponseItem>> TrainPushAsync(List<DeviceSyncTrainPushRequestDto> list)
|
|
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
if (list == null || !list.Any())
|
|
|
|
|
|
return new List<DeviceSyncTrainPushResponseItem>();
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
|
|
|
|
|
var result = new List<DeviceSyncTrainPushResponseItem>();
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
|
|
|
|
|
// 👉 1. 设备校验(可选,看你业务)
|
|
|
|
|
|
var orgId = await GetOrgIdByDeviceAsync(list.First().DeviceSerial);
|
|
|
|
|
|
if (!orgId.HasValue)
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 2. 批量查已存在的 TrainSerial(防重复)
|
|
|
|
|
|
var trainSerials = list.Select(x => x.TrainSerial).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
var existSerials = await _context.YL_Train
|
|
|
|
|
|
.Where(x => trainSerials.Contains(x.TrainSerial))
|
|
|
|
|
|
.Select(x => x.TrainSerial)
|
|
|
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
|
|
|
|
|
var newEntities = new List<YL_Train>();
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
|
|
|
|
|
foreach (var item in list)
|
|
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 👉 3. 唯一校验(跳过已存在)
|
|
|
|
|
|
if (existSerials.Contains(item.TrainSerial))
|
|
|
|
|
|
continue;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
var entity = new YL_Train
|
2026-03-27 10:53:02 +08:00
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
DeviceSerial = item.DeviceSerial,
|
|
|
|
|
|
DeviceType = item.DeviceType,
|
|
|
|
|
|
UserSerial = item.UserSerial,
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
TrainSerial = item.TrainSerial,
|
|
|
|
|
|
VideoSerial = item.VideoSerial,
|
|
|
|
|
|
|
|
|
|
|
|
TrainExam = item.TrainExam,
|
|
|
|
|
|
QuizId = item.QuizId,
|
|
|
|
|
|
|
|
|
|
|
|
StandardCounts = item.StandardCounts,
|
|
|
|
|
|
UnStandardCounts = item.UnStandardCounts,
|
|
|
|
|
|
|
|
|
|
|
|
TimeKeeping = item.TimeKeeping,
|
|
|
|
|
|
Duration = item.Duration,
|
|
|
|
|
|
Distance = item.Distance,
|
|
|
|
|
|
|
|
|
|
|
|
CourseId = item.CourseId,
|
|
|
|
|
|
|
|
|
|
|
|
StartTime = Util.ParseDateTime(item.StartTime),
|
|
|
|
|
|
EndTime = Util.ParseDateTime(item.EndTime),
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 成绩计算(建议统一规则)
|
|
|
|
|
|
Score = CalculateScore(item),
|
|
|
|
|
|
|
|
|
|
|
|
IsValid = 1, // 默认有效
|
|
|
|
|
|
UploadTime = DateTime.Now,
|
|
|
|
|
|
CreateTime = DateTime.Now
|
2026-03-27 10:53:02 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
newEntities.Add(entity);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 4. 批量入库(关键优化点)
|
|
|
|
|
|
if (newEntities.Any())
|
|
|
|
|
|
{
|
|
|
|
|
|
_context.YL_Train.AddRange(newEntities);
|
|
|
|
|
|
await _context.SaveChangesAsync();
|
2026-03-27 10:53:02 +08:00
|
|
|
|
}
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
|
|
|
|
|
// 👉 5. 返回结果
|
|
|
|
|
|
result = newEntities.Select(x => new DeviceSyncTrainPushResponseItem
|
|
|
|
|
|
{
|
|
|
|
|
|
TrainId = x.Id,
|
|
|
|
|
|
UserSerial = x.UserSerial
|
|
|
|
|
|
}).ToList();
|
|
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
private double? CalculateScore(DeviceSyncTrainPushRequestDto item)
|
|
|
|
|
|
{
|
|
|
|
|
|
// 👉 根据课目类型决定成绩字段
|
|
|
|
|
|
// 这里给你一个通用策略(你可以按课目细化)
|
|
|
|
|
|
|
|
|
|
|
|
// 计数类(跳绳/仰卧起坐)
|
|
|
|
|
|
if (item.StandardCounts > 0)
|
|
|
|
|
|
return item.StandardCounts;
|
|
|
|
|
|
|
|
|
|
|
|
// 计时类(悬垂)
|
|
|
|
|
|
if (item.TimeKeeping.HasValue)
|
|
|
|
|
|
return item.TimeKeeping;
|
|
|
|
|
|
|
|
|
|
|
|
// 距离类(跳远)
|
|
|
|
|
|
if (item.Distance.HasValue)
|
|
|
|
|
|
return item.Distance;
|
|
|
|
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
public async Task<DeviceSyncTrainDetailsDto> TrainDetailsAsync(int trainId)
|
|
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 1. 获取训练记录
|
|
|
|
|
|
var train = await _context.YL_Train.FirstOrDefaultAsync(t => t.Id == trainId);
|
2026-03-27 10:53:02 +08:00
|
|
|
|
if (train == null) return null;
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 2. 获取学生信息
|
|
|
|
|
|
var student = await _context.Student.FirstOrDefaultAsync(s => s.StudentNo == train.UserSerial);
|
|
|
|
|
|
if (student == null) return null;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 3. 最近10次训练记录(CountList)
|
|
|
|
|
|
var recentTrains = await _context.YL_Train
|
|
|
|
|
|
.Where(t => t.UserSerial == train.UserSerial && t.CourseId == train.CourseId)
|
|
|
|
|
|
.OrderByDescending(t => t.StartTime)
|
2026-03-27 10:53:02 +08:00
|
|
|
|
.Take(10)
|
2026-04-08 16:09:51 +08:00
|
|
|
|
.Select(t => new CountListItem
|
|
|
|
|
|
{
|
|
|
|
|
|
TrainId = t.Id,
|
|
|
|
|
|
Score = (t.Score ?? 0).ToString("0"), // 先拿数值
|
|
|
|
|
|
Time = t.StartTime.ToString("yyyy-MM-dd HH:mm:ss")
|
|
|
|
|
|
})
|
|
|
|
|
|
.AsNoTracking() // 可选,提高性能
|
|
|
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
|
|
|
|
|
// 在内存中格式化
|
|
|
|
|
|
var recentTrainsDto = recentTrains
|
|
|
|
|
|
.Select(t => new CountListItem
|
|
|
|
|
|
{
|
|
|
|
|
|
TrainId = t.TrainId,
|
|
|
|
|
|
Score = t.Score, // 格式化整数
|
|
|
|
|
|
Time = t.Time
|
|
|
|
|
|
})
|
|
|
|
|
|
.ToList();
|
|
|
|
|
|
|
|
|
|
|
|
// 4. 近10日最佳成绩(DailyList)
|
|
|
|
|
|
var tenDaysAgo = DateTime.Now.Date.AddDays(-10);
|
|
|
|
|
|
|
|
|
|
|
|
var dailyScores = await _context.YL_Train
|
|
|
|
|
|
.Where(t => t.UserSerial == train.UserSerial
|
|
|
|
|
|
&& t.CourseId == train.CourseId
|
|
|
|
|
|
&& t.StartTime >= tenDaysAgo)
|
|
|
|
|
|
.GroupBy(t => t.StartTime.Date)
|
|
|
|
|
|
.Select(g => new
|
|
|
|
|
|
{
|
|
|
|
|
|
Date = g.Key,
|
|
|
|
|
|
MaxScore = g.Max(t => t.Score) ?? 0
|
|
|
|
|
|
})
|
|
|
|
|
|
.OrderByDescending(g => g.Date)
|
2026-03-27 10:53:02 +08:00
|
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 在内存中格式化
|
|
|
|
|
|
var dailyListDto = dailyScores
|
|
|
|
|
|
.Select(d => new DailyListItem
|
|
|
|
|
|
{
|
|
|
|
|
|
Score = d.MaxScore.ToString("0"),
|
|
|
|
|
|
Time = d.Date.ToString("yyyy-MM-dd 00:00:00")
|
|
|
|
|
|
})
|
|
|
|
|
|
.ToList();
|
|
|
|
|
|
|
|
|
|
|
|
// 5. 课程名称(枚举描述)
|
|
|
|
|
|
string courseName = Util.GetEnumDescription<CourseType>(train.CourseId);
|
|
|
|
|
|
|
|
|
|
|
|
// 6. 返回 DTO
|
2026-03-27 10:53:02 +08:00
|
|
|
|
return new DeviceSyncTrainDetailsDto
|
|
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
TrainId = train.Id,
|
|
|
|
|
|
UserSerial = train.UserSerial,
|
|
|
|
|
|
UserType = 2, // 学生
|
|
|
|
|
|
Nickname = student.StudentName,
|
|
|
|
|
|
FacePictureUrl = student.Photo ?? "",
|
2026-03-27 10:53:02 +08:00
|
|
|
|
Identity = "学生",
|
2026-04-08 16:09:51 +08:00
|
|
|
|
OrganizationId = (int)student.ClassId,
|
|
|
|
|
|
OrganizationName = student.ClassName,
|
|
|
|
|
|
Gender = student.Sex == 1 ? "男" : "女",
|
|
|
|
|
|
Score = train.Score?.ToString("0") ?? "0",
|
|
|
|
|
|
UnStandardCounts = train.UnStandardCounts,
|
|
|
|
|
|
CourseId = train.CourseId,
|
|
|
|
|
|
CourseName = courseName,
|
2026-03-27 10:53:02 +08:00
|
|
|
|
TrainType = "自由练习",
|
2026-04-08 16:09:51 +08:00
|
|
|
|
VideoUrl = train.VideoSerial,
|
|
|
|
|
|
StartTime = train.StartTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
|
|
|
|
|
EndTime = train.EndTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
|
|
|
|
|
CountList = recentTrains,
|
|
|
|
|
|
DailyList = dailyListDto,
|
|
|
|
|
|
KeyframeList = new List<KeyframeListItem>() // 暂时为空
|
2026-03-27 10:53:02 +08:00
|
|
|
|
};
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<List<DeviceSyncGradeOrderItemDto>> GradeOrderAsync(DeviceSyncGradeOrderRequestDto dto)
|
|
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 1️⃣ 获取组织ID
|
2026-03-27 10:53:02 +08:00
|
|
|
|
var orgId = await GetOrgIdByDeviceAsync(dto.DeviceSerial);
|
|
|
|
|
|
if (!orgId.HasValue) return new List<DeviceSyncGradeOrderItemDto>();
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 2️⃣ 获取学校编码
|
|
|
|
|
|
string schoolCode = await _context.School
|
|
|
|
|
|
.Where(x => x.Id == orgId)
|
|
|
|
|
|
.Select(x => x.SchoolCode)
|
|
|
|
|
|
.FirstAsync();
|
|
|
|
|
|
|
|
|
|
|
|
// 3️⃣ 时间范围
|
2026-03-27 10:53:02 +08:00
|
|
|
|
var (start, end) = GetDateRange(dto.DateType, dto.QueryStartTime, dto.QueryEndTime);
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 4️⃣ 主查询(YL_Train + Student)
|
|
|
|
|
|
var query = from t in _context.YL_Train
|
|
|
|
|
|
join s in _context.Student on t.UserSerial equals s.StudentNo
|
|
|
|
|
|
where s.SchoolCode == schoolCode
|
|
|
|
|
|
select new { t, s };
|
|
|
|
|
|
|
|
|
|
|
|
// 5️⃣ 条件过滤
|
|
|
|
|
|
if (dto.CourseId.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.t.CourseId == dto.CourseId.Value);
|
|
|
|
|
|
|
|
|
|
|
|
if (dto.Gender.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.s.Sex == dto.Gender.Value);
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
if (dto.OrganizeId != null && dto.OrganizeId.Count > 0)
|
|
|
|
|
|
query = query.Where(x => dto.OrganizeId.Contains(x.s.ClassId ?? 0));
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
if (start.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.t.StartTime >= start.Value);
|
|
|
|
|
|
|
|
|
|
|
|
if (end.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.t.StartTime < end.Value.AddDays(1));
|
|
|
|
|
|
|
|
|
|
|
|
// 6️⃣ 分组求总成绩并排序
|
2026-03-27 10:53:02 +08:00
|
|
|
|
var grouped = await query
|
2026-04-08 16:09:51 +08:00
|
|
|
|
.GroupBy(x => new
|
|
|
|
|
|
{
|
|
|
|
|
|
x.s.Id,
|
|
|
|
|
|
x.s.StudentName,
|
|
|
|
|
|
x.s.ClassId,
|
|
|
|
|
|
x.s.ClassName,
|
|
|
|
|
|
x.s.Sex,
|
|
|
|
|
|
x.t.CourseId,
|
|
|
|
|
|
})
|
|
|
|
|
|
.Select(g => new
|
|
|
|
|
|
{
|
|
|
|
|
|
Key = g.Key,
|
|
|
|
|
|
Score = g.Sum(x => x.t.Score ?? 0)
|
|
|
|
|
|
})
|
2026-03-27 10:53:02 +08:00
|
|
|
|
.OrderByDescending(x => x.Score)
|
|
|
|
|
|
.Skip((dto.Page - 1) * dto.Size)
|
|
|
|
|
|
.Take(dto.Size)
|
|
|
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 7️⃣ 返回结果
|
|
|
|
|
|
return grouped.Select(x => new DeviceSyncGradeOrderItemDto
|
2026-03-27 10:53:02 +08:00
|
|
|
|
{
|
|
|
|
|
|
UserId = x.Key.Id,
|
|
|
|
|
|
Nickname = x.Key.StudentName,
|
2026-04-08 16:09:51 +08:00
|
|
|
|
OrganizationId = x.Key.ClassId ?? 0,
|
2026-03-27 10:53:02 +08:00
|
|
|
|
OrganizationName = x.Key.ClassName ?? "",
|
|
|
|
|
|
Gender = x.Key.Sex,
|
2026-04-08 16:09:51 +08:00
|
|
|
|
Score = x.Score.ToString("0.##"),
|
|
|
|
|
|
CourseId = x.Key.CourseId,
|
|
|
|
|
|
CourseName = Util.GetEnumDescription<CourseType>(x.Key.CourseId)
|
|
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
}).ToList();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
private static DateTime? TryParseTrainTime(string tsCreateTime, string tdStartTime, string tdEndTime)
|
|
|
|
|
|
{
|
|
|
|
|
|
foreach (var s in new[] { tdEndTime, tdStartTime, tsCreateTime })
|
|
|
|
|
|
{
|
|
|
|
|
|
if (string.IsNullOrWhiteSpace(s)) continue;
|
|
|
|
|
|
if (DateTime.TryParse(s, out var d)) return d;
|
|
|
|
|
|
}
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<List<DeviceSyncLastGradeItemDto>> LastGradeAsync(DeviceSyncLastGradeRequestDto dto)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (dto == null || dto.UserSerials == null || dto.UserSerials.Count == 0)
|
|
|
|
|
|
return new List<DeviceSyncLastGradeItemDto>();
|
|
|
|
|
|
|
|
|
|
|
|
// 去掉空白、重复序列号
|
|
|
|
|
|
var orderedUnique = dto.UserSerials
|
|
|
|
|
|
.Where(x => !string.IsNullOrWhiteSpace(x))
|
|
|
|
|
|
.Select(x => x.Trim())
|
|
|
|
|
|
.Distinct(StringComparer.OrdinalIgnoreCase)
|
|
|
|
|
|
.ToList();
|
|
|
|
|
|
|
|
|
|
|
|
if (!orderedUnique.Any()) return new List<DeviceSyncLastGradeItemDto>();
|
|
|
|
|
|
|
|
|
|
|
|
// 查询学生信息
|
|
|
|
|
|
var students = await _context.Student
|
|
|
|
|
|
.Where(s => orderedUnique.Contains(s.StudentNo))
|
|
|
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
|
|
|
|
|
S_Student MatchStudent(string serial) =>
|
|
|
|
|
|
students.FirstOrDefault(s => string.Equals(s.StudentNo, serial, StringComparison.OrdinalIgnoreCase));
|
|
|
|
|
|
|
|
|
|
|
|
// 获取学生最近一次训练记录
|
|
|
|
|
|
var studentSerials = students.Select(s => s.StudentNo).ToList();
|
|
|
|
|
|
var trainRows = await _context.YL_Train
|
|
|
|
|
|
.Where(t => studentSerials.Contains(t.UserSerial))
|
|
|
|
|
|
.GroupBy(t => t.UserSerial)
|
|
|
|
|
|
.Select(g => g
|
|
|
|
|
|
.OrderByDescending(t => t.EndTime)
|
|
|
|
|
|
.FirstOrDefault())
|
|
|
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
|
|
|
|
|
var trainMap = trainRows.ToDictionary(t => t.UserSerial, t => t);
|
|
|
|
|
|
|
|
|
|
|
|
var result = new List<DeviceSyncLastGradeItemDto>();
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var serial in orderedUnique)
|
|
|
|
|
|
{
|
|
|
|
|
|
var st = MatchStudent(serial);
|
|
|
|
|
|
if (st == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
result.Add(new DeviceSyncLastGradeItemDto
|
|
|
|
|
|
{
|
|
|
|
|
|
UserSerial = serial,
|
|
|
|
|
|
UserId = 0,
|
|
|
|
|
|
Nickname = "",
|
|
|
|
|
|
OrganizationId = 0,
|
|
|
|
|
|
OrganizationName = "",
|
|
|
|
|
|
Gender = 0,
|
|
|
|
|
|
FacePictureUrl = "",
|
|
|
|
|
|
Score = "0",
|
|
|
|
|
|
UnStandardCounts = 0,
|
|
|
|
|
|
StartTime = "",
|
|
|
|
|
|
EndTime = "",
|
|
|
|
|
|
CourseId = 0,
|
|
|
|
|
|
CourseName = ""
|
|
|
|
|
|
});
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
trainMap.TryGetValue(serial, out var train);
|
|
|
|
|
|
|
|
|
|
|
|
result.Add(new DeviceSyncLastGradeItemDto
|
|
|
|
|
|
{
|
|
|
|
|
|
UserSerial = st.StudentNo,
|
|
|
|
|
|
UserId = st.Id,
|
|
|
|
|
|
TrainId = train?.Id ?? 0,
|
|
|
|
|
|
Nickname = st.StudentName,
|
|
|
|
|
|
OrganizationId = st.ClassId ?? 0,
|
|
|
|
|
|
OrganizationName = st.ClassName ?? "",
|
|
|
|
|
|
Gender = st.Sex,
|
|
|
|
|
|
FacePictureUrl = st.Photo ?? "",
|
|
|
|
|
|
Score = train?.Score?.ToString("0") ?? "0",
|
|
|
|
|
|
UnStandardCounts = train?.UnStandardCounts ?? 0,
|
|
|
|
|
|
StartTime = train?.StartTime.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
|
|
|
|
|
|
EndTime = train?.EndTime.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
|
|
|
|
|
|
CourseId = train?.CourseId ?? 0,
|
|
|
|
|
|
CourseName = "" // 如果你的 YL_Train 表里有课程名称字段,可以填充
|
|
|
|
|
|
});
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
public async Task<List<DeviceSyncRecordAppItemDto>> RecordAppAsync(DeviceSyncRecordAppRequestDto dto)
|
|
|
|
|
|
{
|
|
|
|
|
|
var orgId = await GetOrgIdByDeviceAsync(dto.DeviceSerial);
|
2026-04-08 16:09:51 +08:00
|
|
|
|
if (!orgId.HasValue)
|
|
|
|
|
|
return new List<DeviceSyncRecordAppItemDto>();
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 1. 学校编码
|
|
|
|
|
|
string schoolCode = await _context.School
|
|
|
|
|
|
.Where(x => x.Id == orgId)
|
|
|
|
|
|
.Select(x => x.SchoolCode)
|
|
|
|
|
|
.FirstAsync();
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 👉 2. 时间范围
|
2026-03-27 10:53:02 +08:00
|
|
|
|
var (start, end) = GetDateRange(dto.DateType, dto.QueryStartTime, dto.QueryEndTime);
|
|
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 👉 3. 主查询(YL_Train + Student)
|
|
|
|
|
|
var query = from t in _context.YL_Train
|
|
|
|
|
|
join s in _context.Student on t.UserSerial equals s.StudentNo
|
2026-03-27 10:53:02 +08:00
|
|
|
|
where s.SchoolCode == schoolCode
|
2026-04-08 16:09:51 +08:00
|
|
|
|
select new { t, s };
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 4. 条件过滤
|
|
|
|
|
|
if (dto.CourseId.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.t.CourseId == dto.CourseId.Value);
|
|
|
|
|
|
|
|
|
|
|
|
if (dto.Gender.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.s.Sex == dto.Gender.Value);
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(dto.UserSerial))
|
|
|
|
|
|
query = query.Where(x => x.t.UserSerial == dto.UserSerial);
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(dto.UserName))
|
|
|
|
|
|
query = query.Where(x => x.s.StudentName.Contains(dto.UserName));
|
|
|
|
|
|
|
|
|
|
|
|
if (dto.OrganizeId != null && dto.OrganizeId.Count > 0)
|
|
|
|
|
|
query = query.Where(x => dto.OrganizeId.Contains(x.s.ClassId ?? 0));
|
|
|
|
|
|
|
|
|
|
|
|
if (start.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.t.StartTime >= start.Value);
|
|
|
|
|
|
|
|
|
|
|
|
if (end.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.t.StartTime < end.Value.AddDays(1));
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 5. 分页 + 排序
|
|
|
|
|
|
var list = await query
|
|
|
|
|
|
.OrderByDescending(x => x.t.StartTime)
|
2026-03-27 10:53:02 +08:00
|
|
|
|
.Skip((dto.Page - 1) * dto.Size)
|
|
|
|
|
|
.Take(dto.Size)
|
|
|
|
|
|
.Select(x => new DeviceSyncRecordAppItemDto
|
|
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
TrainId = x.t.Id,
|
|
|
|
|
|
|
|
|
|
|
|
Nickname = x.s.StudentName,
|
|
|
|
|
|
OrganizationId = x.s.ClassId ?? 0,
|
|
|
|
|
|
OrganizationName = x.s.ClassName,
|
|
|
|
|
|
|
|
|
|
|
|
Gender = x.s.Sex,
|
|
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
FacePictureUrl = x.s.Photo,
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
|
|
|
|
|
Score = x.t.Score.HasValue ? x.t.Score.Value.ToString("0.##") : "0",
|
|
|
|
|
|
|
|
|
|
|
|
StartTime = x.t.StartTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
|
|
|
|
|
EndTime = x.t.EndTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
|
|
|
|
|
|
|
|
|
|
|
CourseId = x.t.CourseId,
|
|
|
|
|
|
CourseName = $"课目{x.t.CourseId}" // 👉 建议后面接字典表
|
2026-03-27 10:53:02 +08:00
|
|
|
|
})
|
|
|
|
|
|
.ToListAsync();
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
|
|
|
|
|
return list;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<DeviceSyncMyRecordResponseDto> MyRecordAsync(DeviceSyncMyRecordRequestDto dto)
|
|
|
|
|
|
{
|
2026-04-08 16:09:51 +08:00
|
|
|
|
var result = new DeviceSyncMyRecordResponseDto();
|
|
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
var orgId = await GetOrgIdByDeviceAsync(dto.DeviceSerial);
|
2026-04-08 16:09:51 +08:00
|
|
|
|
if (!orgId.HasValue) return result;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
// 👉 1. 查学生
|
|
|
|
|
|
string schoolCode = await _context.School
|
|
|
|
|
|
.Where(x => x.Id == orgId)
|
|
|
|
|
|
.Select(x => x.SchoolCode)
|
|
|
|
|
|
.FirstAsync();
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
var student = await _context.Student
|
|
|
|
|
|
.FirstOrDefaultAsync(x => x.SchoolCode == schoolCode && x.StudentNo == dto.UserSerial);
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
2026-04-08 16:09:51 +08:00
|
|
|
|
if (student == null) return result;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
|
|
|
|
|
|
var c = await _context.Class.FindAsync(student.ClassId);
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
|
|
|
|
|
// 👉 2. 时间范围
|
|
|
|
|
|
var (start, end) = GetDateRange(dto.DateType, dto.QueryStartTime, dto.QueryEndTime);
|
|
|
|
|
|
|
|
|
|
|
|
var query = _context.YL_Train
|
|
|
|
|
|
.Where(x => x.UserSerial == dto.UserSerial);
|
|
|
|
|
|
|
|
|
|
|
|
if (start.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.StartTime >= start.Value);
|
|
|
|
|
|
|
|
|
|
|
|
if (end.HasValue)
|
|
|
|
|
|
query = query.Where(x => x.StartTime < end.Value.AddDays(1));
|
|
|
|
|
|
|
|
|
|
|
|
if (dto.CourseType > 0)
|
|
|
|
|
|
query = query.Where(x => x.CourseId == dto.CourseType);
|
|
|
|
|
|
|
|
|
|
|
|
var trains = await query.ToListAsync();
|
|
|
|
|
|
|
|
|
|
|
|
if (!trains.Any())
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 3. 统计
|
|
|
|
|
|
var trainDays = trains.Select(x => x.StartTime.Date).Distinct().Count();
|
|
|
|
|
|
var totalSeconds = trains.Sum(x => x.Duration);
|
|
|
|
|
|
var trainHours = (totalSeconds / 3600.0).ToString("0.00");
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 4. gradeList(按天统计)
|
|
|
|
|
|
var gradeList = trains
|
|
|
|
|
|
.GroupBy(x => x.StartTime.Date)
|
|
|
|
|
|
.Select(g => new GradeListItem
|
|
|
|
|
|
{
|
|
|
|
|
|
Time = g.Key.ToString("yyyy-MM-dd"),
|
|
|
|
|
|
Duration = g.Sum(x => x.Duration).ToString(),
|
|
|
|
|
|
Count = g.Sum(x => x.StandardCounts).ToString()
|
|
|
|
|
|
}).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 5. graphTrainList(课目统计)
|
|
|
|
|
|
var graphList = trains
|
|
|
|
|
|
.GroupBy(x => x.CourseId)
|
|
|
|
|
|
.Select(g => new GraphTrainListItem
|
|
|
|
|
|
{
|
|
|
|
|
|
CourseId = g.Key,
|
|
|
|
|
|
CourseName = $"课目{g.Key}", // 👉 可换成字典表
|
|
|
|
|
|
Time = g.Sum(x => x.Duration).ToString(),
|
|
|
|
|
|
Count = g.Count()
|
|
|
|
|
|
}).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 6. courseBestList(最好/平均/最差)
|
|
|
|
|
|
var courseBestList = trains
|
|
|
|
|
|
.Where(x => x.Score.HasValue)
|
|
|
|
|
|
.GroupBy(x => x.CourseId)
|
|
|
|
|
|
.Select(g => new CourseBestListItem
|
|
|
|
|
|
{
|
|
|
|
|
|
CourseId = g.Key,
|
|
|
|
|
|
CourseName = $"课目{g.Key}",
|
|
|
|
|
|
BestGrade = g.Max(x => x.Score).ToString(),
|
|
|
|
|
|
AvgGrade = g.Average(x => x.Score).ToString(),
|
|
|
|
|
|
WorstGrade = g.Min(x => x.Score).ToString()
|
|
|
|
|
|
}).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
// 👉 7. 返回
|
|
|
|
|
|
result = new DeviceSyncMyRecordResponseDto
|
2026-03-27 10:53:02 +08:00
|
|
|
|
{
|
|
|
|
|
|
UserSync = new UserSyncDto
|
|
|
|
|
|
{
|
|
|
|
|
|
UserId = student.Id,
|
|
|
|
|
|
UserType = 2,
|
|
|
|
|
|
Nickname = student.StudentName,
|
|
|
|
|
|
OrganizationId = student.ClassId ?? 0,
|
|
|
|
|
|
OrganizationName = c?.ClassName ?? "",
|
|
|
|
|
|
FacePictureUrl = student.Photo,
|
|
|
|
|
|
Identity = "学生",
|
|
|
|
|
|
Gender = student.Sex == 1 ? "男" : "女",
|
|
|
|
|
|
Birthday = student.Birthday?.ToString("yyyy-MM-dd") ?? "",
|
2026-04-08 16:09:51 +08:00
|
|
|
|
UserSerial = student.StudentNo,
|
|
|
|
|
|
Height = "",
|
|
|
|
|
|
Weight = ""
|
2026-03-27 10:53:02 +08:00
|
|
|
|
},
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
TrainCourseSum = graphList.Count,
|
2026-04-08 16:09:51 +08:00
|
|
|
|
TrainDays = trainDays,
|
|
|
|
|
|
TrainHours = trainHours,
|
2026-03-27 10:53:02 +08:00
|
|
|
|
TrainCounts = trains.Count,
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
|
|
|
|
|
GradeList = gradeList,
|
|
|
|
|
|
GraphTrainList = graphList,
|
|
|
|
|
|
CourseBestList = courseBestList
|
2026-03-27 10:53:02 +08:00
|
|
|
|
};
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
|
|
|
|
|
return result;
|
2026-03-27 10:53:02 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<TeacherLoginResponseDto> TeacherLoginAsync(TeacherLoginRequestDto dto)
|
|
|
|
|
|
{
|
|
|
|
|
|
var pwdHash = MD5Helper.MD5Encrypt32(dto.Password);
|
|
|
|
|
|
var user = await _context.Sys_User.FirstOrDefaultAsync(x => x.UserName == dto.Username && x.UserPwd == pwdHash);
|
|
|
|
|
|
if (user == null) return null;
|
|
|
|
|
|
|
|
|
|
|
|
var school = await _context.School.FirstOrDefaultAsync(x => x.SchoolCode == user.SchoolCode);
|
|
|
|
|
|
return new TeacherLoginResponseDto
|
|
|
|
|
|
{
|
|
|
|
|
|
UserId = user.User_Id,
|
|
|
|
|
|
Nickname = user.UserTrueName ?? user.UserName,
|
|
|
|
|
|
Username = user.UserName,
|
|
|
|
|
|
OrganizationId = school?.Id ?? 0,
|
|
|
|
|
|
OrganizationName = school?.SchoolName ?? user.SchoolName ?? "",
|
|
|
|
|
|
SerialNumber = user.UserName,
|
|
|
|
|
|
Classification = 1,
|
|
|
|
|
|
Gender = user.Gender
|
|
|
|
|
|
};
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<AppVerifyResponseDto> AppVerifyAsync(AppVerifyRequestDto dto)
|
|
|
|
|
|
{
|
|
|
|
|
|
return new AppVerifyResponseDto
|
|
|
|
|
|
{
|
|
|
|
|
|
VersionNumber = dto.VersionNumber,
|
|
|
|
|
|
NeedForcedUpdating = 0,
|
|
|
|
|
|
UpdateUrl = null,
|
|
|
|
|
|
HardwareType = dto.HardwareType,
|
|
|
|
|
|
ApplyName = dto.ApplyName
|
|
|
|
|
|
};
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public async Task<DeviceSyncUserDto> GetUserDetailAsync(string deviceSerial, int userId)
|
|
|
|
|
|
{
|
|
|
|
|
|
var orgId = await GetOrgIdByDeviceAsync(deviceSerial);
|
|
|
|
|
|
if (!orgId.HasValue) return null;
|
|
|
|
|
|
|
|
|
|
|
|
string schoolCode = await _context.School.Where(x => x.Id == orgId).Select(x => x.SchoolCode).FirstAsync();
|
|
|
|
|
|
var s = await _context.Student.FirstOrDefaultAsync(x => x.Id == userId && x.SchoolCode == schoolCode);
|
|
|
|
|
|
if (s == null) return null;
|
|
|
|
|
|
|
|
|
|
|
|
var dto = new DeviceSyncUserDto
|
|
|
|
|
|
{
|
|
|
|
|
|
UserId = s.Id,
|
|
|
|
|
|
UserType = 2,
|
|
|
|
|
|
Username = s.StudentNo,
|
|
|
|
|
|
Nickname = s.StudentName,
|
|
|
|
|
|
OrganizationId = s.ClassId ?? 0,
|
|
|
|
|
|
OrganizationName = s.ClassName ?? "",
|
|
|
|
|
|
GradeName = "",
|
|
|
|
|
|
FacePictureUrl = s.Photo ?? "",
|
|
|
|
|
|
Identity = "学生",
|
|
|
|
|
|
Gender = s.Sex == 1 ? "男" : "女",
|
|
|
|
|
|
Birthday = s.Birthday.HasValue ? s.Birthday.Value.ToString("yyyy-MM-dd") : "",
|
|
|
|
|
|
UserSerial = s.StudentNo
|
|
|
|
|
|
};
|
|
|
|
|
|
var c = await _context.Class.FindAsync(dto.OrganizationId);
|
|
|
|
|
|
if (c != null)
|
|
|
|
|
|
{
|
|
|
|
|
|
dto.OrganizationName = c.ClassName ?? "";
|
|
|
|
|
|
dto.GradeName = c.GradeName ?? "";
|
|
|
|
|
|
}
|
|
|
|
|
|
return dto;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private static (DateTime? start, DateTime? end) GetDateRange(int dateType, string queryStart, string queryEnd)
|
|
|
|
|
|
{
|
|
|
|
|
|
var now = DateTime.Now;
|
|
|
|
|
|
return dateType switch
|
|
|
|
|
|
{
|
|
|
|
|
|
1 => (now.Date, now.Date),
|
|
|
|
|
|
2 => (now.AddDays(-(int)now.DayOfWeek + 1).Date, now.Date),
|
|
|
|
|
|
3 => (new DateTime(now.Year, now.Month, 1), now.Date),
|
|
|
|
|
|
4 => (now.Month >= 9 ? new DateTime(now.Year, 9, 1) : new DateTime(now.Year - 1, 9, 1), now.Date),
|
|
|
|
|
|
5 => (DateTime.TryParse(queryStart, out var s) ? s : (DateTime?)null, DateTime.TryParse(queryEnd, out var e) ? e : (DateTime?)null),
|
|
|
|
|
|
_ => (null, null)
|
|
|
|
|
|
};
|
|
|
|
|
|
}
|
2026-04-08 16:09:51 +08:00
|
|
|
|
|
2026-03-27 10:53:02 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|