培训记录 新增学习时长、考试时长

master
xiaochanghai 10 months ago
parent 6c890f334e
commit 11ba8ff8ce
  1. 5
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 38
      Tiobon.Core.Common/Helper/StringHelper.cs
  3. 8
      Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs
  4. 7
      Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
  5. 5
      Tiobon.Core/Tiobon.Core.Model.xml

@ -13272,6 +13272,11 @@
必/选修人员 必/选修人员
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordDto.ExamDuration">
<summary>
考试时长
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleDto"> <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleDto">
<summary> <summary>
必选修规则(Dto.View) 必选修规则(Dto.View)

@ -116,4 +116,42 @@ public class StringHelper
return sid; return sid;
} }
#endregion #endregion
/// <summary>
/// 格式化数字字符,并保留指定的小数位
/// </summary>
/// <param name="value">需要处理的值</param>
/// <param name="reservedDigit">保留小数点后位数,-1时只会去除小数点后最后几位的0</param>
/// <returns></returns>
public static string TrimNumber(decimal value, int reservedDigit)
{
try
{
string result = string.Empty;
if (!string.IsNullOrEmpty(Convert.ToString(value)))
{
//此处主要是为MVC页面中数字类型的字段作处理
if (value != decimal.MinValue)
{
Decimal tmp = Decimal.Parse(Convert.ToString(value));
if (reservedDigit == -1)
{
result = string.Format("{0:#0.##########}", tmp);
}
else
{
result = String.Format("{0:N" + reservedDigit.ToString() + "}", tmp);
result = result.Replace(",", "");
}
}
}
return result;
}
catch (Exception E)
{
throw E;
}
}
} }

@ -129,4 +129,12 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord
/// 必/选修人员 /// 必/选修人员
/// </summary> /// </summary>
public string StaffTypeLabel { get; set; } public string StaffTypeLabel { get; set; }
/// <summary>
/// 考试时长
/// </summary>
public string ExamDuration { get; set; }
public DateTime? ActualEndTime { get; set; }
public DateTime? ActualBeginTime { get; set; }
} }

@ -11,6 +11,7 @@ using Newtonsoft.Json;
using Tiobon.Core.Common.Helper; using Tiobon.Core.Common.Helper;
using SqlSugar; using SqlSugar;
using static Tiobon.Core.Model.Consts; using static Tiobon.Core.Model.Consts;
using Microsoft.IdentityModel.Tokens;
namespace Tiobon.Core.Services namespace Tiobon.Core.Services
{ {
@ -83,6 +84,12 @@ namespace Tiobon.Core.Services
if (!string.IsNullOrWhiteSpace(entity.Indate)) if (!string.IsNullOrWhiteSpace(entity.Indate))
entity.Indate = DateTimeHelper.ConvertToDayString(entity.Indate); entity.Indate = DateTimeHelper.ConvertToDayString(entity.Indate);
entity.ExamDate = DateTimeHelper.ConvertToDayString(entity.ExamDate); entity.ExamDate = DateTimeHelper.ConvertToDayString(entity.ExamDate);
if (entity.ActualBeginTime != null && entity.ActualEndTime != null)
{
TimeSpan timeDifference = entity.ActualEndTime.Value - entity.ActualBeginTime.Value;
entity.ExamDuration = StringHelper.TrimNumber(Convert.ToDecimal(timeDifference.TotalMinutes), 2);
}
}); });
return new ServicePageResult<Ghre_StudyRecordDto>(filter.pageNum, total, filter.pageSize, entitys); return new ServicePageResult<Ghre_StudyRecordDto>(filter.pageNum, total, filter.pageSize, entitys);

@ -13272,6 +13272,11 @@
必/选修人员 必/选修人员
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordDto.ExamDuration">
<summary>
考试时长
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleDto"> <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleDto">
<summary> <summary>
必选修规则(Dto.View) 必选修规则(Dto.View)

Loading…
Cancel
Save