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

优化

Browse Source
master
xiaochanghai 11 months ago
parent b0e429cb6b
commit e83bf73c16
7 changed files with 56 additions and 36 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. 17
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 32
      Tiobon.Core.Model/Consts.cs
  3. 2
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  4. 9
      Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs
  5. 13
      Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
  6. 2
      Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
  7. 17
      Tiobon.Core/Tiobon.Core.Model.xml

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

@ -12727,19 +12727,24 @@
培训记录-课程状态-已结束 培训记录-课程状态-已结束
</summary> </summary>
</member> </member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN"> <member name="T:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus">
<summary> <summary>
培训记录-学习状态-未参与 培训记录-学习状态
</summary> </summary>
</member> </member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_FINISH"> <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_JOIN">
<summary> <summary>
培训记录-学习状态-未完成 未参与
</summary> </summary>
</member> </member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_HAS_FINISH"> <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_FINISH">
<summary> <summary>
培训记录-学习状态-已完成 未完成
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.HAS_FINISH">
<summary>
已完成
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS"> <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS">

32
Tiobon.Core.Model/Consts.cs
Unescape View File

@ -60,11 +60,11 @@ public class Consts
/// 人工出题 /// 人工出题
/// </summary> /// </summary>
public const string MANUAL = "manual"; public const string MANUAL = "manual";
/// <summary> /// <summary>
/// 随机出题 /// 随机出题
/// </summary> /// </summary>
public const string RANDOM = "random"; public const string RANDOM = "random";
} }
#endregion #endregion
@ -157,21 +157,25 @@ public class Consts
#endregion #endregion
#region 培训记录-学习状态 #region 培训记录-学习状态
/// <summary>
/// 培训记录-学习状态-未参与
/// </summary>
public const string DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN = "NoJoin";
/// <summary> /// <summary>
/// 培训记录-学习状态-未完成 /// 培训记录-学习状态
/// </summary> /// </summary>
public const string DIC_STUDY_RECORD_STUDY_STATUS_FINISH = "NoFinish";
/// <summary> public static class DicStudyRecordStudyStatus
/// 培训记录-学习状态-已完成 {
/// </summary> /// <summary>
public const string DIC_STUDY_RECORD_STUDY_STATUS_HAS_FINISH = "HasFinish"; /// 未参与
/// </summary>
public const string NO_JOIN = "NoJoin";
/// <summary>
/// 未完成
/// </summary>
public const string NO_FINISH = "NoFinish";
/// <summary>
/// 已完成
/// </summary>
public const string HAS_FINISH = "HasFinish";
}
#endregion #endregion

2
Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
Unescape View File

@ -1280,7 +1280,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
CourseEndTime = courseTime.Date.AddMonths(snap?.ValidityPeriod ?? 1), CourseEndTime = courseTime.Date.AddMonths(snap?.ValidityPeriod ?? 1),
CourseType = Consts.DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED, CourseType = Consts.DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED,
CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN, CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
StudyStatus = Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN StudyStatus = Consts.DicStudyRecordStudyStatus.NO_JOIN
}); });
} }
if (inserts.Any()) if (inserts.Any())

9
Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs
Unescape View File

@ -75,12 +75,9 @@ public class Ghre_RequiredCourseServices : BaseServices<Ghre_RequiredCourse, Ghr
x.StudyStatusLabel = await GetParaLabel("TrainingStudyStatus", x.StudyStatus); x.StudyStatusLabel = await GetParaLabel("TrainingStudyStatus", x.StudyStatus);
//x.IsPassLabel = x.IsPass == true ? "是" : "否"; //x.IsPassLabel = x.IsPass == true ? "是" : "否";
if (x.Indate != null) x.Indate1 = DateTimeHelper.ConvertToDayString(x.Indate);
x.Indate1 = x.Indate.Value.ToString("yyyy-MM-dd"); x.DueDate1 = DateTimeHelper.ConvertToDayString(x.DueDate);
if (x.DueDate != null) x.ExamDate1 = DateTimeHelper.ConvertToDayString(x.ExamDate);
x.DueDate1 = x.DueDate.Value.ToString("yyyy-MM-dd");
if (x.ExamDate != null)
x.ExamDate1 = x.ExamDate.Value.ToString("yyyy-MM-dd");
}); });

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

@ -12,6 +12,7 @@ using Tiobon.Core.Common.Helper;
using MySqlX.XDevAPI.Common; using MySqlX.XDevAPI.Common;
using SqlSugar; using SqlSugar;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services namespace Tiobon.Core.Services
{ {
@ -83,6 +84,7 @@ 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);
}); });
return new ServicePageResult<Ghre_StudyRecordDto>(filter.pageNum, total, filter.pageSize, entitys); return new ServicePageResult<Ghre_StudyRecordDto>(filter.pageNum, total, filter.pageSize, entitys);
@ -485,7 +487,7 @@ namespace Tiobon.Core.Services
CourseEndTime = courseTime.Date.AddMonths(snap?.ValidityPeriod ?? 1), CourseEndTime = courseTime.Date.AddMonths(snap?.ValidityPeriod ?? 1),
CourseType = "Elective", CourseType = "Elective",
CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN, CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
StudyStatus = Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN StudyStatus = Consts.DicStudyRecordStudyStatus.NO_JOIN
}); });
} }
return ServiceResult.OprateSuccess("加入成功！"); return ServiceResult.OprateSuccess("加入成功！");
@ -508,6 +510,8 @@ namespace Tiobon.Core.Services
public async Task<bool> GenerateStaffStudyRecord(ISqlSugarClient Db, long studyRecordId) public async Task<bool> GenerateStaffStudyRecord(ISqlSugarClient Db, long studyRecordId)
{ {
var record = await Db.Queryable<Ghre_StudyRecord>().FirstAsync(x => x.Id == studyRecordId); var record = await Db.Queryable<Ghre_StudyRecord>().FirstAsync(x => x.Id == studyRecordId);
decimal studyProgress = 0; decimal studyProgress = 0;
var sql = $@"SELECT ISNULL (A.Hours, 0) * 60 + A.Minutes Minutes var sql = $@"SELECT ISNULL (A.Hours, 0) * 60 + A.Minutes Minutes
FROM Ghre_CourseWare A FROM Ghre_CourseWare A
@ -526,8 +530,13 @@ namespace Tiobon.Core.Services
studyProgress = 100; studyProgress = 100;
} }
sql = $"UPDATE Ghre_StudyRecord SET StudyProgress = ISNULL(StudyProgress, 0)+{studyProgress} WHERE Id='{studyRecordId}'"; var studyStatus = DicStudyRecordStudyStatus.NO_FINISH;
if (studyProgress == 100)
studyStatus = DicStudyRecordStudyStatus.HAS_FINISH;
sql = $"UPDATE Ghre_StudyRecord SET StudyProgress = ISNULL(StudyProgress, 0)+{studyProgress},StudyStatus='{studyStatus}' WHERE Id='{studyRecordId}'";
if (studyProgress > 0) await Db.Ado.ExecuteCommandAsync(sql); if (studyProgress > 0) await Db.Ado.ExecuteCommandAsync(sql);
sql = $"UPDATE Ghre_StudyRecord SET BeginTime=GETDATE(),StudyStatus='{studyStatus}' WHERE BeginTime IS NULL AND Id='{studyRecordId}'";
await Db.Ado.ExecuteCommandAsync(sql);
return true; return true;
} }
#endregion #endregion

2
Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
Unescape View File

@ -270,7 +270,7 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
CourseEndTime = courseTime.Date.AddMonths((rule.DeadlineMonth ?? snap?.ValidityPeriod) ?? 1), CourseEndTime = courseTime.Date.AddMonths((rule.DeadlineMonth ?? snap?.ValidityPeriod) ?? 1),
CourseType = rule.RuleType, CourseType = rule.RuleType,
CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN, CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
StudyStatus = Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN, StudyStatus = Consts.DicStudyRecordStudyStatus.NO_JOIN,
Year = rule.Year Year = rule.Year
}); });
insertResults.Add(new Ghre_StudyRuleResult() insertResults.Add(new Ghre_StudyRuleResult()

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

@ -12727,19 +12727,24 @@
培训记录-课程状态-已结束 培训记录-课程状态-已结束
</summary> </summary>
</member> </member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN"> <member name="T:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus">
<summary> <summary>
培训记录-学习状态-未参与 培训记录-学习状态
</summary> </summary>
</member> </member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_FINISH"> <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_JOIN">
<summary> <summary>
培训记录-学习状态-未完成 未参与
</summary> </summary>
</member> </member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_HAS_FINISH"> <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_FINISH">
<summary> <summary>
培训记录-学习状态-已完成 未完成
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.HAS_FINISH">
<summary>
已完成
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS"> <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS">

Write Preview
Loading…
Cancel
Save