考试新增最终得分

master
Tiobon 2 months ago
parent 021680359c
commit 74203eeae2
  1. 10
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 2
      Tiobon.Core.Api/Tiobon.Core.xml
  3. 8
      Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecord.Dto.Base.cs
  4. 8
      Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs
  5. 2
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
  6. 1
      Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
  7. 56
      Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
  8. 10
      Tiobon.Core/Tiobon.Core.Model.xml
  9. 7
      Tiobon.Core/Tiobon.Core.xml

@ -4740,6 +4740,11 @@
答题次数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.FinallyScore">
<summary>
最终得分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase">
<summary>
Ghre_ExamRecordAnswer (Dto.Base)
@ -21937,6 +21942,11 @@
答题次数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.FinallyScore">
<summary>
最终得分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer">
<summary>
Ghre_ExamRecordAnswer (Model)

@ -1455,7 +1455,7 @@
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryRecord(System.Int64)">
<summary>
开始
记录
</summary>
<param name="id"></param>
<returns></returns>

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/3/10 23:34:26 SimonHsiao
*V0.01 2025-04-14 16:33:46 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -255,4 +255,10 @@ public class Ghre_ExamRecordBase
/// 答题次数
/// </summary>
public int? AnswerCount { get; set; }
/// <summary>
/// 最终得分
/// </summary>
[Display(Name = "FinallyScore"), Description("最终得分"), Column(TypeName = "decimal(20,2)")]
public decimal? FinallyScore { get; set; }
}

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/3/10 23:34:26 SimonHsiao
*V0.01 2025-04-14 16:33:46 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -256,4 +256,10 @@ public class Ghre_ExamRecord : BasePoco
/// 答题次数
/// </summary>
public int? AnswerCount { get; set; }
/// <summary>
/// 最终得分
/// </summary>
[Display(Name = "FinallyScore"), Description("最终得分"), Column(TypeName = "decimal(20,2)")]
public decimal? FinallyScore { get; set; }
}

@ -345,7 +345,7 @@ public class Ghre_ExamPaperServices : BaseServices<Ghre_ExamPaper, Ghre_ExamPape
label = "系统内置",
field = "BuiltIn",
elementType = "Switch",
required = true,
required = false,
multipleSelect = false,
editable = true,
}

@ -1,7 +1,6 @@
using AgileObjects.AgileMapper.Extensions;
using Microsoft.Extensions.Logging;
using MongoDB.Driver.Linq;
using NPOI.SS.Formula.Functions;
using System.Net;
using System.Text.RegularExpressions;
using static Tiobon.Core.Model.Consts;

@ -85,8 +85,41 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
}
}
}
else
if (!string.IsNullOrWhiteSpace(value))
else if (name == "CourseId")
{
string sql = string.Empty;
if (!string.IsNullOrWhiteSpace(value))
{
var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
if (jsonParam.columnValue.IsNotEmptyOrNull())
switch (jsonParam.operationKey)
{
//case "Include":
// query = query.Where(x => x.CourseId != null && ids.Contains(x.CourseId.Value));
// break;
//case "NotInclude":
// query = query.Where(x => x.CourseId != null && !ids1.Contains(x.CourseId.Value));
// break;
//case "IsNull":
// query = query.Where(x => x.CourseId == null);
// break;
//case "NotNull":
// query = query.Where(x => x.CourseId != null);
// break;
case "Equal":
query = query.Where(x => x.CourseId == jsonParam.columnValue.ObjToLong() || x.CourseIds.Contains(jsonParam.columnValue.ObjToString()));
break;
//case "NotEqual":
// query = query.Where(x => x.CourseId != id1);
// break;
default:
break;
}
}
}
else if (!string.IsNullOrWhiteSpace(value))
{
var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
@ -226,6 +259,25 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
}
continue;
}
else if (name == "CourseId")
{
var jsonParam = JsonHelper.JsonToObj<JsonParam>(value);
if (jsonParam.columnValue != null)
{
switch (jsonParam.operationKey)
{
case "Equal":
if (jsonParam.columnValue != null)
conditions += @$" AND (CourseIds like '%{jsonParam.columnValue}%' or CourseId='{jsonParam.columnValue}')";
break;
default:
break;
}
}
continue;
}
if (!string.IsNullOrWhiteSpace(value))
conditions = DealConditions(conditions, name, value);

@ -4740,6 +4740,11 @@
答题次数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.FinallyScore">
<summary>
最终得分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase">
<summary>
Ghre_ExamRecordAnswer (Dto.Base)
@ -21937,6 +21942,11 @@
答题次数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.FinallyScore">
<summary>
最终得分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer">
<summary>
Ghre_ExamRecordAnswer (Model)

@ -1453,6 +1453,13 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryRecord(System.Int64)">
<summary>
记录
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_SurveyOptionController">
<summary>
问卷调查选项(Controller)

Loading…
Cancel
Save