diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_ExamRecordExtend.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_ExamRecordExtend.cs
index 6b16b917..8e0bf9ca 100644
--- a/Tiobon.Core.Model/ViewModels/Extend/Ghre_ExamRecordExtend.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_ExamRecordExtend.cs
@@ -1,4 +1,6 @@
-namespace Tiobon.Core.Model;
+using Tiobon.Core.Model.Models;
+
+namespace Tiobon.Core.Model;
public class Ghre_ExamRecordExtend : DefaultGhre_ExamPaperPageData
{
@@ -17,6 +19,7 @@ public class Ghre_ExamRecordExtend : DefaultGhre_ExamPaperPageData
public class QueryExam : DefaultGhre_ExamPaperPageData
{
public long Id { get; set; }
+ public string Status1 { get; set; }
///
/// 课程名称
diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index 18e2a959..bc97ca30 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -2074,6 +2074,7 @@ public partial class CommonServices : BaseServices>, ICommon
break;
case "F_TrainPlan_Temporary":
+ case "F_UshioTrainPlan_Temporary":
sql = $@"SELECT A.RoleId, B.RoleNo, B.RoleName
FROM Ghrs_UserRole A LEFT JOIN Ghrs_Role B ON A.RoleId = B.RoleId
@@ -2097,6 +2098,7 @@ public partial class CommonServices : BaseServices>, ICommon
}
break;
case "F_TrainPlan_WaitConfirm":
+ case "F_UshioTrainPlan_WaitConfirm":
result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()
{
display = true,
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
index 85219fc5..57249d58 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
@@ -2,6 +2,7 @@
using MongoDB.Driver.Linq;
using System.Net;
using System.Text.RegularExpressions;
+using Tiobon.Core.Model.Models;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services;
@@ -540,7 +541,9 @@ public class Ghre_ExamRecordServices : BaseServices.OprateFailed("无效的考试链接！");
+
var record = records.result.DT_TableDataT1.FirstOrDefault();
+ extend.Status1 = record.Status;
if (studyRecord.IsNull())
studyRecord = await Db.Queryable().FirstAsync(x => x.Id == record.StudyRecordId);
@@ -576,11 +579,10 @@ public class Ghre_ExamRecordServices : BaseServices= dt.Date) && (record.Status == DIC_EXAM_RECORD_STATUS.WAIT || record.Status == DIC_EXAM_RECORD_STATUS.EXAMING))
+ if (!(record.BeginTime.Value.Date <= dt.Date && record.EndTime.Value.Date >= dt.Date) &&
+ (record.Status == DIC_EXAM_RECORD_STATUS.WAIT || record.Status == DIC_EXAM_RECORD_STATUS.EXAMING))
{
- record.Status = DIC_EXAM_RECORD_STATUS.EXAM_END;
-
- record.RetakeTimes = 10000;
+ extend.IsAllowExam = false;
}
}
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 7e79da8c..f4fcfac2 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -1049,6 +1049,9 @@ public class Ghre_StudyRecordServices : BaseServices dt || dt > x.ExamEndDate))
+ x.DisableExamBtn = true;
+
if (x.FeedbackOrderId.IsNull())
x.ShowFeedbackBtn = false;
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 1016d3bd..0a59cd37 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -8155,6 +8155,156 @@
预留字段12
+
+
+ 【牛尾】培训计划 (Dto.Base)
+
+
+
+
+ 年份
+
+
+
+
+ 类别
+
+
+
+
+ 部门ID
+
+
+
+
+ 课程ID
+
+
+
+
+ 课程
+
+
+
+
+ 培训对象
+
+
+
+
+ 现状
+
+
+
+
+ 培训预期效果
+
+
+
+
+ 需求人数
+
+
+
+
+ 培训天数
+
+
+
+
+ 内外训
+
+
+
+
+ 指导者
+
+
+
+
+ 合计预算
+
+
+
+
+ 计划实施月份
+
+
+
+
+ 状态
+
+
+
+
+ 备注
+
+
+
+
+ 默认标志
+
+
+
+
+ 预留字段1
+
+
+
+
+ 预留字段2
+
+
+
+
+ 预留字段3
+
+
+
+
+ 预留字段4
+
+
+
+
+ 预留字段5
+
+
+
+
+ 预留字段6
+
+
+
+
+ 预留字段7
+
+
+
+
+ 预留字段8
+
+
+
+
+ 预留字段9
+
+
+
+
+ 预留字段10
+
+
+
+
+ 预留字段11
+
+
+
+
+ 预留字段12
+
+
面试评估设定 (Dto.Base)
@@ -14402,6 +14552,11 @@
培训讲师异动附件 (Dto.EditInput)
+
+
+ 【牛尾】培训计划 (Dto.EditInput)
+
+
面试评估设定 (Dto.EditInput)
@@ -14922,6 +15077,11 @@
培训讲师异动附件 (Dto.InsertInput)
+
+
+ 【牛尾】培训计划 (Dto.InsertInput)
+
+
面试评估设定 (Dto.InsertInput)
@@ -23351,6 +23511,156 @@
预留字段12
+
+
+ 【牛尾】培训计划 (Model)
+
+
+
+
+ 年份
+
+
+
+
+ 类别
+
+
+
+
+ 部门ID
+
+
+
+
+ 课程ID
+
+
+
+
+ 课程
+
+
+
+
+ 培训对象
+
+
+
+
+ 现状
+
+
+
+
+ 培训预期效果
+
+
+
+
+ 需求人数
+
+
+
+
+ 培训天数
+
+
+
+
+ 内外训
+
+
+
+
+ 指导者
+
+
+
+
+ 合计预算
+
+
+
+
+ 计划实施月份
+
+
+
+
+ 状态
+
+
+
+
+ 备注
+
+
+
+
+ 默认标志
+
+
+
+
+ 预留字段1
+
+
+
+
+ 预留字段2
+
+
+
+
+ 预留字段3
+
+
+
+
+ 预留字段4
+
+
+
+
+ 预留字段5
+
+
+
+
+ 预留字段6
+
+
+
+
+ 预留字段7
+
+
+
+
+ 预留字段8
+
+
+
+
+ 预留字段9
+
+
+
+
+ 预留字段10
+
+
+
+
+ 预留字段11
+
+
+
+
+ 预留字段12
+
+
任务日志表
@@ -31467,6 +31777,21 @@
修改信息
+
+
+ 【牛尾】培训计划(Dto.View1)
+
+
+
+
+ 创建信息
+
+
+
+
+ 修改信息
+
+
面试评估设定(Dto.View1)
diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml
index 492730fe..8270da1f 100644
--- a/Tiobon.Core/Tiobon.Core.xml
+++ b/Tiobon.Core/Tiobon.Core.xml
@@ -1396,6 +1396,19 @@
status
+
+
+ 【牛尾】培训计划(Controller)
+
+
+
+
+ 根据条件查询数据
+
+ 条件
+ status
+
+
面试评估设定(Controller)