Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

培训记录查询 新增记录有效时期显示列

Browse Source 
串联必选修规则结果有效期设定和培训记录串联
master
xiaochanghai 4 months ago
parent ebf0930e11
commit 4f8a47033e
8 changed files with 2444 additions and 2308 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4639
      Model/Tiobon.Web.pdm
  2. 25
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 12
      Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
  4. 12
      Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
  5. 6
      Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs
  6. 15
      Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
  7. 6
      Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
  8. 37
      Tiobon.Core/Tiobon.Core.Model.xml

4639
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

25
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -6785,6 +6785,16 @@
开班ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.ValidBeginTime">
<summary>
有效开始时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.ValidEndTime">
<summary>
有效结束时间
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailBase">
<summary>
培训记录明细 (Dto.Base)
@ -21761,6 +21771,16 @@
开班ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.ValidBeginTime">
<summary>
有效开始时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.ValidEndTime">
<summary>
有效结束时间
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetail">
<summary>
培训记录明细 (Model)
@ -30877,6 +30897,11 @@
考试状态
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordDto.ResultValidPeriod">
<summary>
结果有效期
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailDto">
<summary>
培训记录明细(Dto.View1)

12
Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
Unescape View File

@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
*V0.01 2025/2/24 9:43:08 SimonHsiao 初版
*V0.01 2025/2/24 14:54:30 SimonHsiao 初版
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@ -209,4 +209,14 @@ public class Ghre_StudyRecordBase
/// 开班ID
/// </summary>
public long? OpenClassId { get; set; }
/// <summary>
/// 有效开始时间
/// </summary>
public DateTime? ValidBeginTime { get; set; }
/// <summary>
/// 有效结束时间
/// </summary>
public DateTime? ValidEndTime { get; set; }
}

12
Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
Unescape View File

@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
*V0.01 2025/2/24 9:43:08 SimonHsiao 初版
*V0.01 2025/2/24 14:54:30 SimonHsiao 初版
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@ -210,4 +210,14 @@ public class Ghre_StudyRecord : BasePoco
/// 开班ID
/// </summary>
public long? OpenClassId { get; set; }
/// <summary>
/// 有效开始时间
/// </summary>
public DateTime? ValidBeginTime { get; set; }
/// <summary>
/// 有效结束时间
/// </summary>
public DateTime? ValidEndTime { get; set; }
}

6
Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs
Unescape View File

@ -155,4 +155,10 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord
/// </summary>
public string ExamStatus { get; set; }
public bool? IsViewResult { get; set; } = false;
/// <summary>
/// 结果有效期
/// </summary>
public string ResultValidPeriod { get; set; }
}

15
Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
Unescape View File

@ -1016,6 +1016,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
record.IsPass = examPaper.PassScore > (record.Score + record.AdjustScore) ? false : true;
record.FinallyIsPass = record.IsPass;
await Db.Updateable(record).UpdateColumns(it => new { it.IsPass, it.FinallyIsPass }, true)//true表示追加AOP赋值列
.ExecuteCommandAsync();
@ -1071,6 +1072,20 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
}
#region 处理培训记录有效时间
if (studyRecord.StudyRuleId != null)
{
var studyRule = await Db.Queryable<Ghre_StudyRule>().FirstAsync(x => x.Id == studyRecord.StudyRuleId);
if (studyRule != null && studyRule.ResultValidPeriod != null)
{
studyRecord.ValidBeginTime = DateTime.Now;
studyRecord.ValidEndTime = studyRecord.ValidBeginTime.Value.AddMonths(studyRule.ResultValidPeriod.Value);
await Db.Updateable(studyRecord).UpdateColumns(it => new { it.ValidBeginTime, it.ValidEndTime }, true)//true表示追加AOP赋值列
.ExecuteCommandAsync();
}
}
#endregion
return true;
}

6
Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
Unescape View File

@ -110,11 +110,13 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
#region 处理场景对应课程
if (entity.CourseSceneId.IsNotEmptyOrNull())
{
entity.CourseName = string.Join("\n", courses.Where(x => x.CourseSceneId == entity.CourseSceneId).Select(x => x.CourseName + " (" + x.CourseNo + ")"));
}
#endregion
if (entity.StudyStatus == DIC_STUDY_RECORD_STUDY_STATUS.HAS_FINISH)
if (entity.ValidBeginTime != null && entity.ValidEndTime != null)
entity.ResultValidPeriod = DateTimeHelper.ConvertToDayString(entity.ValidBeginTime) + "~" + DateTimeHelper.ConvertToDayString(entity.ValidEndTime);
else entity.ResultValidPeriod = "长期";
});
return new ServicePageResult<Ghre_StudyRecordDto>(filter.pageNum, total, filter.pageSize, entitys);

37
Tiobon.Core/Tiobon.Core.Model.xml
Unescape View File

@ -6785,6 +6785,16 @@
开班ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.ValidBeginTime">
<summary>
有效开始时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.ValidEndTime">
<summary>
有效结束时间
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailBase">
<summary>
培训记录明细 (Dto.Base)
@ -7035,6 +7045,11 @@
部门是否含下阶
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleBase.ResultValidPeriod">
<summary>
结果有效期
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleResultBase">
<summary>
必选修规则结果 (Dto.Base)
@ -21756,6 +21771,16 @@
开班ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.ValidBeginTime">
<summary>
有效开始时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.ValidEndTime">
<summary>
有效结束时间
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetail">
<summary>
培训记录明细 (Model)
@ -21903,7 +21928,7 @@
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRule.JobId">
<summary>
岗位
职称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRule.Year">
@ -22006,6 +22031,11 @@
部门是否含下阶
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRule.ResultValidPeriod">
<summary>
结果有效期
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleResult">
<summary>
必选修规则结果 (Model)
@ -30867,6 +30897,11 @@
考试状态
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordDto.ResultValidPeriod">
<summary>
结果有效期
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailDto">
<summary>
培训记录明细(Dto.View1)

Write Preview
Loading…
Cancel
Save