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

必选修考试时 新增判断是否可以开始

Browse Source
master
xiaochanghai 4 months ago
parent 647e772011
commit 447256fe5e
6 changed files with 353 additions and 5 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. 5
      Tiobon.Core.Model/ViewModels/Extend/Ghre_ExamRecordExtend.cs
  2. 2
      Tiobon.Core.Services/CommonServices.cs
  3. 10
      Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
  4. 3
      Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
  5. 325
      Tiobon.Core/Tiobon.Core.Model.xml
  6. 13
      Tiobon.Core/Tiobon.Core.xml

5
Tiobon.Core.Model/ViewModels/Extend/Ghre_ExamRecordExtend.cs
Unescape View File

@ -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; }
/// <summary>
/// 课程名称

2
Tiobon.Core.Services/CommonServices.cs
Unescape View File

@ -2074,6 +2074,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, ICommon
}
break;
case "F_TrainPlan_WaitConfirm":
case "F_UshioTrainPlan_WaitConfirm":
result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()
{
display = true,

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

@ -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<Ghre_ExamRecord, Ghre_ExamRe
if (!records.result.DT_TableDataT1.Any())
return ServiceResult<QueryExam>.OprateFailed("无效的考试链接！");
var record = records.result.DT_TableDataT1.FirstOrDefault();
extend.Status1 = record.Status;
if (studyRecord.IsNull())
studyRecord = await Db.Queryable<Ghre_StudyRecord>().FirstAsync(x => x.Id == record.StudyRecordId);
@ -576,11 +579,10 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
}
else
{
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))
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;
}
}

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

@ -1049,6 +1049,9 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
if (x.StudyProgress < 100 || x.ExamId.IsNull())
x.DisableExamBtn = true;
if (x.ExamId.IsNotEmptyOrNull() && (x.ExamBeginDate > dt || dt > x.ExamEndDate))
x.DisableExamBtn = true;
if (x.FeedbackOrderId.IsNull())
x.ShowFeedbackBtn = false;

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

@ -8155,6 +8155,156 @@
预留字段12
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_UshioPlanBase">
<summary>
【牛尾】培训计划 (Dto.Base)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Year">
<summary>
年份
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.TrainCategory">
<summary>
类别
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.DeptId">
<summary>
部门ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.CourseId">
<summary>
课程ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.CourseName">
<summary>
课程
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.StaffIds">
<summary>
培训对象
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.StatusQuo">
<summary>
现状
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.DesiredResult">
<summary>
培训预期效果
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.TrainNum">
<summary>
需求人数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.TrainDays">
<summary>
培训天数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.InOrOut">
<summary>
内外训
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Leader">
<summary>
指导者
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.TotalBudget">
<summary>
合计预算
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Month">
<summary>
计划实施月份
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Status">
<summary>
状态
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanBase.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrh_AssessConfigBase">
<summary>
面试评估设定 (Dto.Base)
@ -14402,6 +14552,11 @@
培训讲师异动附件 (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhre_UshioPlanInput">
<summary>
【牛尾】培训计划 (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhrh_AssessConfigInput">
<summary>
面试评估设定 (Dto.EditInput)
@ -14922,6 +15077,11 @@
培训讲师异动附件 (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhre_UshioPlanInput">
<summary>
【牛尾】培训计划 (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhrh_AssessConfigInput">
<summary>
面试评估设定 (Dto.InsertInput)
@ -23351,6 +23511,156 @@
预留字段12
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_UshioPlan">
<summary>
【牛尾】培训计划 (Model)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Year">
<summary>
年份
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.TrainCategory">
<summary>
类别
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.DeptId">
<summary>
部门ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.CourseId">
<summary>
课程ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.CourseName">
<summary>
课程
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.StaffIds">
<summary>
培训对象
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.StatusQuo">
<summary>
现状
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.DesiredResult">
<summary>
培训预期效果
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.TrainNum">
<summary>
需求人数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.TrainDays">
<summary>
培训天数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.InOrOut">
<summary>
内外训
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Leader">
<summary>
指导者
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.TotalBudget">
<summary>
合计预算
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Month">
<summary>
计划实施月份
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Status">
<summary>
状态
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlan.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_TasksLog">
<summary>
任务日志表
@ -31467,6 +31777,21 @@
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_UshioPlanDto">
<summary>
【牛尾】培训计划(Dto.View1)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanDto.CreateDataInfo">
<summary>
创建信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_UshioPlanDto.UpdateDataInfo">
<summary>
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrh_AssessConfigDto">
<summary>
面试评估设定(Dto.View1)

13
Tiobon.Core/Tiobon.Core.xml
Unescape View File

@ -1396,6 +1396,19 @@
<param name="status">status</param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_UshioPlanController">
<summary>
【牛尾】培训计划(Controller)
</summary>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_UshioPlanController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
<summary>
根据条件查询数据
</summary>
<param name="body">条件</param>
<param name="status">status</param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghrh_AssessConfigController">
<summary>
面试评估设定(Controller)

Write Preview
Loading…
Cancel
Save