合并
This commit is contained in:
parent
1e089bcab3
commit
6d75714460
@ -35,6 +35,6 @@ namespace VOL.Business.IServices.ShangWaiMao
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="paramDto"></param>
|
/// <param name="paramDto"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<byte[]> ExportHeartRateDataAsync(ShangWaiMaoHeartRateExportParam paramDto);
|
Task<byte[]> ExportHeartRateDataAsync(ShangWaiMaoHeartRateExportParam paramDto);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -161,14 +161,12 @@ namespace VOL.Business.Services.ShangWaiMao
|
|||||||
var baseTime = GetMinuteBaseTime(group.Key.CourseStartTime, group.Min(x => x.ScoreTime));
|
var baseTime = GetMinuteBaseTime(group.Key.CourseStartTime, group.Min(x => x.ScoreTime));
|
||||||
|
|
||||||
var minuteData = BuildMinuteData(group, baseTime);
|
var minuteData = BuildMinuteData(group, baseTime);
|
||||||
|
|
||||||
var duration = minuteData.Count == 0 ? 0 : minuteData.Keys.Max();
|
var duration = minuteData.Count == 0 ? 0 : minuteData.Keys.Max();
|
||||||
var avgHeartRate = Math.Round(group.Average(x => x.Value), 2);
|
var avgHeartRate = (int)group.Average(x => x.Value);
|
||||||
var avgStrength = Math.Round(group.Average(x => x.Strength), 2);
|
var avgStrength = (int)group.Average(x => x.Strength);
|
||||||
var density = group.Any()
|
var density = group.Any() ? Math.Round(group.Count(x => x.Strength > 50) * 100D / group.Count(), 0) : 0D;
|
||||||
? Math.Round(group.Count(x => x.Strength > 50) * 100D / group.Count(), 2)
|
|
||||||
: 0D;
|
var totalConsumption = Math.Abs((int)group.Average(x => x.Consumption ?? 0));
|
||||||
var totalConsumption = Math.Round(group.Sum(x => (double)(x.Consumption ?? 0)), 2);
|
|
||||||
|
|
||||||
summarySheet.Cells[summaryRowIndex, 1].Value = group.Key.StudentName;
|
summarySheet.Cells[summaryRowIndex, 1].Value = group.Key.StudentName;
|
||||||
summarySheet.Cells[summaryRowIndex, 2].Value = group.Key.StudentNo;
|
summarySheet.Cells[summaryRowIndex, 2].Value = group.Key.StudentNo;
|
||||||
|
|||||||
@ -70,6 +70,6 @@ namespace VOL.WebApi.Controllers.Business
|
|||||||
Response.Headers.Add("Content-Disposition", "attachment; filename=ExportedData.xlsx");
|
Response.Headers.Add("Content-Disposition", "attachment; filename=ExportedData.xlsx");
|
||||||
Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||||
return File(excelBytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $"学生课程心率与运动数据统计{DateTime.Now:yyyyMMddHHmmss}.xlsx");
|
return File(excelBytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $"学生课程心率与运动数据统计{DateTime.Now:yyyyMMddHHmmss}.xlsx");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user