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

新增同步培训记录至员工信息调度任务

Browse Source
master
xiaochanghai 9 months ago
parent 20ea2d56c6
commit 11334b82ce
8 changed files with 729 additions and 407 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. 816
      Model/Tiobon.Web.pdm
  2. 245
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 5
      Tiobon.Core.Api/Tiobon.Core.xml
  4. 5
      Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
  5. 1
      Tiobon.Core.Model/Models/Ghra/Ghra_StaffTraining.cs
  6. 5
      Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
  7. 6
      Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs
  8. 51
      Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs

816
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

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

@ -974,6 +974,111 @@
Reverse5 Reverse5
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase">
<summary>
Ghra_StaffTraining (Dto.Base)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.StaffTrainingID">
<summary>
StaffTrainingID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.StaffID">
<summary>
StaffID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.TrainingOrgID">
<summary>
TrainingOrgID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.TrainingOrgName">
<summary>
TrainingOrgName
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.CourseID">
<summary>
CourseID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.CourseName">
<summary>
CourseName
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.ClassHour">
<summary>
ClassHour
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.IsPass">
<summary>
IsPass
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.ClassCredit">
<summary>
ClassCredit
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.BeginDate">
<summary>
BeginDate
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.EndDate">
<summary>
EndDate
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.AttachmentIDs">
<summary>
AttachmentIDs
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.RemarkSz">
<summary>
RemarkSz
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.SortNo">
<summary>
SortNo
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.IsDefault">
<summary>
IsDefault
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.Reverse1">
<summary>
Reverse1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.Reverse2">
<summary>
Reverse2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.Reverse3">
<summary>
Reverse3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.Reverse4">
<summary>
Reverse4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingBase.Reverse5">
<summary>
Reverse5
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghra_TitleBase"> <member name="T:Tiobon.Core.Model.Models.Ghra_TitleBase">
<summary> <summary>
Ghra_Title (Dto.Base) Ghra_Title (Dto.Base)
@ -4700,6 +4805,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.StaffTrainingId">
<summary>
员工培训ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleBase">
<summary> <summary>
必选修规则 (Dto.Base) 必选修规则 (Dto.Base)
@ -6362,6 +6472,11 @@
Ghra_StaffLicence (Dto.EditInput) Ghra_StaffLicence (Dto.EditInput)
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Models.EditGhra_StaffTrainingInput">
<summary>
Ghra_StaffTraining (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhra_TitleInput"> <member name="T:Tiobon.Core.Model.Models.EditGhra_TitleInput">
<summary> <summary>
Ghra_Title (Dto.EditInput) Ghra_Title (Dto.EditInput)
@ -6602,6 +6717,11 @@
Ghra_StaffLicence (Dto.InsertInput) Ghra_StaffLicence (Dto.InsertInput)
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Models.InsertGhra_StaffTrainingInput">
<summary>
Ghra_StaffTraining (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhra_TitleInput"> <member name="T:Tiobon.Core.Model.Models.InsertGhra_TitleInput">
<summary> <summary>
Ghra_Title (Dto.InsertInput) Ghra_Title (Dto.InsertInput)
@ -7968,6 +8088,111 @@
Reverse5 Reverse5
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Models.Ghra_StaffTraining">
<summary>
Ghra_StaffTraining (Model)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.StaffTrainingID">
<summary>
StaffTrainingID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.StaffID">
<summary>
StaffID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.TrainingOrgID">
<summary>
TrainingOrgID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.TrainingOrgName">
<summary>
TrainingOrgName
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.CourseID">
<summary>
CourseID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.CourseName">
<summary>
CourseName
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.ClassHour">
<summary>
ClassHour
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.IsPass">
<summary>
IsPass
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.ClassCredit">
<summary>
ClassCredit
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.BeginDate">
<summary>
BeginDate
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.EndDate">
<summary>
EndDate
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.AttachmentIDs">
<summary>
AttachmentIDs
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.RemarkSz">
<summary>
RemarkSz
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.SortNo">
<summary>
SortNo
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.IsDefault">
<summary>
IsDefault
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.Reverse1">
<summary>
Reverse1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.Reverse2">
<summary>
Reverse2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.Reverse3">
<summary>
Reverse3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.Reverse4">
<summary>
Reverse4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTraining.Reverse5">
<summary>
Reverse5
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghra_Title"> <member name="T:Tiobon.Core.Model.Models.Ghra_Title">
<summary> <summary>
Ghra_Title (Model) Ghra_Title (Model)
@ -11696,6 +11921,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.StaffTrainingId">
<summary>
员工培训ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRule"> <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRule">
<summary> <summary>
必选修规则 (Model) 必选修规则 (Model)
@ -14202,6 +14432,21 @@
修改信息 修改信息
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Models.Ghra_StaffTrainingDto">
<summary>
Ghra_StaffTraining(Dto.View)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingDto.CreateDataInfo">
<summary>
创建信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghra_StaffTrainingDto.UpdateDataInfo">
<summary>
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghra_TitleDto"> <member name="T:Tiobon.Core.Model.Models.Ghra_TitleDto">
<summary> <summary>
Ghra_Title(Dto.View) Ghra_Title(Dto.View)

5
Tiobon.Core.Api/Tiobon.Core.xml
Unescape View File

@ -614,6 +614,11 @@
Ghra_StaffLicence(Controller) Ghra_StaffLicence(Controller)
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Api.Controllers.Ghra_StaffTrainingController">
<summary>
Ghra_StaffTraining(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghra_TitleController"> <member name="T:Tiobon.Core.Api.Controllers.Ghra_TitleController">
<summary> <summary>
Ghra_Title(Controller) Ghra_Title(Controller)

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

@ -201,5 +201,10 @@ namespace Tiobon.Core.Model.Models
/// 预留字段12 /// 预留字段12
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
/// <summary>
/// 员工培训ID
/// </summary>
public int? StaffTrainingId { get; set; }
} }
} }

1
Tiobon.Core.Model/Models/Ghra/Ghra_StaffTraining.cs
Unescape View File

@ -32,6 +32,7 @@ namespace Tiobon.Core.Model.Models
/// <summary> /// <summary>
/// StaffTrainingID /// StaffTrainingID
/// </summary> /// </summary>
[SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")]
public int? StaffTrainingID { get; set; } public int? StaffTrainingID { get; set; }
/// <summary> /// <summary>

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

@ -202,5 +202,10 @@ namespace Tiobon.Core.Model.Models
/// 预留字段12 /// 预留字段12
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
/// <summary>
/// 员工培训ID
/// </summary>
public int? StaffTrainingId { get; set; }
} }
} }

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

@ -93,7 +93,7 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord
/// <summary> /// <summary>
/// 标准课时 /// 标准课时
/// </summary> /// </summary>
public string StandardHour { get; set; } public int? StandardHour { get; set; }
/// <summary> /// <summary>
/// 考试日期 /// 考试日期
/// </summary> /// </summary>
@ -125,7 +125,7 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord
/// 获得学分 /// 获得学分
/// </summary> /// </summary>
public string CreditPoints { get; set; } public int? CreditPoints { get; set; }
/// <summary> /// <summary>
/// 来源 /// 来源
/// </summary> /// </summary>
@ -146,7 +146,7 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord
/// <summary> /// <summary>
/// 是否合格 /// 是否合格
/// </summary> /// </summary>
public string IsPass { get; set; } public bool? IsPass { get; set; }
public int UpdateYN { get; set; } = 0; public int UpdateYN { get; set; } = 0;

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

@ -19,6 +19,8 @@ using NPOI.SS.Util;
using NPOI.XSSF.UserModel; using NPOI.XSSF.UserModel;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using System.Data; using System.Data;
using Microsoft.AspNetCore.Http.HttpResults;
using Org.BouncyCastle.Crypto;
namespace Tiobon.Core.Services; namespace Tiobon.Core.Services;
@ -370,7 +372,8 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
if (record.ExamDate != null) if (record.ExamDate != null)
DT_TableDataT1[i].ExamDate = record.ExamDate.Value.ToString(); DT_TableDataT1[i].ExamDate = record.ExamDate.Value.ToString();
if (record.IsPass != null) if (record.IsPass != null)
DT_TableDataT1[i].IsPass = record.IsPass == true ? "true" : "false"; DT_TableDataT1[i].IsPass = record.IsPass;
//DT_TableDataT1[i].IsPass = record.IsPass == true ? "true" : "false";
} }
} }
@ -1366,7 +1369,53 @@ WHERE A.Id = '{id}'";
#region 记录学习时长 #region 记录学习时长
public async Task SyncToESS() public async Task SyncToESS()
{ {
var dt = DateTime.Now;
var records = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.EndTime != null && x.EndTime.Value.Date == dt.AddDays(-1).Date && x.StaffTrainingId == null).Select(x => x.Id).ToListAsync();
for (int i = 0; i < records.Count; i++)
{
var sql = @$"SELECT A.Id,
A.CourseId,
A.StaffId,
A.EndTime,
A.BeginTime,
A.CourseEndTime,
A.CourseBeginTime,
A.CourseSceneId,
A.IsPass,
isnull (A.CourseName, A.CourseScene) CourseName,
A.StandardHour,
isnull (c.SchoolName, '内部培训') Reverse1,A.CreditPoints,A.StaffTrainingId
FROM Ghre_StudyRecord_V A
LEFT JOIN Ghre_Course b ON A.CourseId = b.Id
LEFT JOIN Ghre_School c ON b.SchoolId = c.Id
WHERE A.id = {records[i]} ";
var record = await Db.Ado.SqlQuerySingleAsync<Ghre_StudyRecordDto>(sql);
var train = new Ghra_StaffTraining()
{
StaffID = record.StaffId,
CourseName = record.CourseName,
TrainingOrgName = record.Reverse1,
ClassHour = record.StandardHour,
ClassCredit = record.CreditPoints,
BeginDate = record.BeginTime,
EndDate = record.EndTime,
IsPass = record.IsPass == true ? 1 : 0,
CreateBy = 0,
CreateTime = DateTime.Now
};
var result = await Db.Insertable(train).ExecuteReturnIdentityAsync();
await Db.Updateable<Ghre_StudyRecord>()
.SetColumns(it => new Ghre_StudyRecord()
{
StaffTrainingId = result
})
.Where(it => it.Id == records[i])
.ExecuteCommandAsync();
} }
}
#endregion #endregion
} }
Write Preview
Loading…
Cancel
Save