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

新增实操分

Browse Source
master
xiaochanghai 6 months ago
parent ef435a3cec
commit 170bd93408
8 changed files with 2978 additions and 2913 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. 5338
      Model/Tiobon.Web.pdm
  2. 7
      Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs
  3. 50
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  4. 2
      Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs
  5. 45
      Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecord.Dto.Base.cs
  6. 28
      Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs
  7. 19
      Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
  8. 50
      Tiobon.Core/Tiobon.Core.Model.xml

5338
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

7
Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs
Unescape View File

@ -31,7 +31,6 @@ public class Ghre_ExamRecordController : BaseController<IGhre_ExamRecordServices
{ {
return await _service.Query(examId, body); return await _service.Query(examId, body);
} }
#endregion #endregion
[HttpPost("ModifyAdjustScore/{examRecordId}")] [HttpPost("ModifyAdjustScore/{examRecordId}")]
@ -40,6 +39,12 @@ public class Ghre_ExamRecordController : BaseController<IGhre_ExamRecordServices
return await _service.ModifyAdjustScore(examRecordId, edit); return await _service.ModifyAdjustScore(examRecordId, edit);
} }
[HttpPost("ModifyActualScore/{examRecordId}")]
public async Task<ServiceResult> ModifyActualScore(string examRecordId, [FromBody] EditGhre_ExamRecordInput edit)
{
return await _service.ModifyActualScore(examRecordId, edit);
}
/// <summary> /// <summary>
/// 获取考试记录明细扩展接口 /// 获取考试记录明细扩展接口
/// </summary> /// </summary>

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

@ -4285,16 +4285,6 @@
来源 来源
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.RemarkSz"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.RemarkSz">
<summary> <summary>
备注 备注
@ -4365,6 +4355,21 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.ActualScore">
<summary>
实操分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase">
<summary> <summary>
Ghre_ExamRecordAnswer (Dto.Base) Ghre_ExamRecordAnswer (Dto.Base)
@ -17786,16 +17791,6 @@
来源 来源
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.RemarkSz"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.RemarkSz">
<summary> <summary>
备注 备注
@ -17866,6 +17861,21 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.ActualScore">
<summary>
实操分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer"> <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer">
<summary> <summary>
Ghre_ExamRecordAnswer (Model) Ghre_ExamRecordAnswer (Model)

2
Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs
Unescape View File

@ -27,4 +27,6 @@ public interface IGhre_ExamRecordServices : IBaseServices<Ghre_ExamRecord, Ghre_
Task<ServiceResult> AnswerExamAsync(List<DefaultGhre_ExamPaperPreview> answers, long studyRecordId); Task<ServiceResult> AnswerExamAsync(List<DefaultGhre_ExamPaperPreview> answers, long studyRecordId);
Task<ServiceResult> ViewExamPaperCallBackAsync(long examRecordId); Task<ServiceResult> ViewExamPaperCallBackAsync(long examRecordId);
Task<ServiceResult> ModifyActualScore(string examRecordId, EditGhre_ExamRecordInput edit);
} }

45
Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecord.Dto.Base.cs
Unescape View File

@ -6,7 +6,7 @@
* *
* Ver 变更日期 负责人 变更内容 * Ver 变更日期 负责人 变更内容
* ─────────────────────────────────── * ───────────────────────────────────
*V0.01 2024/7/24 13:42:13 SimonHsiao 初版 *V0.01 2024/12/23 14:36:50 SimonHsiao 初版
* *
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐ *┌──────────────────────────────────┐
@ -14,18 +14,14 @@
*│　作者：SimonHsiao │ *│　作者：SimonHsiao │
*└──────────────────────────────────┘ *└──────────────────────────────────┘
*/ */
using System.ComponentModel; namespace Tiobon.Core.Model.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Tiobon.Core.Model.Models
{
/// <summary> /// <summary>
/// 考试记录 (Dto.Base) /// 考试记录 (Dto.Base)
/// </summary> /// </summary>
public class Ghre_ExamRecordBase public class Ghre_ExamRecordBase
{ {
/// <summary> /// <summary>
/// 试卷ID /// 试卷ID
@ -123,16 +119,6 @@ namespace Tiobon.Core.Model.Models
[Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")]
public string Source { get; set; } public string Source { get; set; }
/// <summary>
/// 是否查看试卷
/// </summary>
public bool? IsView { get; set; }
/// <summary>
/// 查看试卷时间
/// </summary>
public DateTime? ViewTime { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
@ -213,5 +199,20 @@ namespace Tiobon.Core.Model.Models
/// 预留字段12 /// 预留字段12
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
}
/// <summary>
/// 是否查看试卷
/// </summary>
public bool? IsView { get; set; }
/// <summary>
/// 查看试卷时间
/// </summary>
public DateTime? ViewTime { get; set; }
/// <summary>
/// 实操分
/// </summary>
[Display(Name = "ActualScore"), Description("实操分"), Column(TypeName = "decimal(20,2)")]
public decimal? ActualScore { get; set; }
} }

28
Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs
Unescape View File

@ -6,7 +6,7 @@
* *
* Ver 变更日期 负责人 变更内容 * Ver 变更日期 负责人 变更内容
* ─────────────────────────────────── * ───────────────────────────────────
*V0.01 2024/7/24 13:42:13 SimonHsiao 初版 *V0.01 2024/12/23 14:36:50 SimonHsiao 初版
* *
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐ *┌──────────────────────────────────┐
@ -120,16 +120,6 @@ public class Ghre_ExamRecord : BasePoco
[Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")]
public string Source { get; set; } public string Source { get; set; }
/// <summary>
/// 是否查看试卷
/// </summary>
public bool? IsView { get; set; }
/// <summary>
/// 查看试卷时间
/// </summary>
public DateTime? ViewTime { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
@ -210,4 +200,20 @@ public class Ghre_ExamRecord : BasePoco
/// 预留字段12 /// 预留字段12
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
/// <summary>
/// 是否查看试卷
/// </summary>
public bool? IsView { get; set; }
/// <summary>
/// 查看试卷时间
/// </summary>
public DateTime? ViewTime { get; set; }
/// <summary>
/// 实操分
/// </summary>
[Display(Name = "ActualScore"), Description("实操分"), Column(TypeName = "decimal(20,2)")]
public decimal? ActualScore { get; set; }
} }

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

@ -115,6 +115,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
x.TotalScore += x.Score ?? 0; x.TotalScore += x.Score ?? 0;
x.TotalScore += x.AdjustScore ?? 0; x.TotalScore += x.AdjustScore ?? 0;
x.TotalScore += x.ActualScore ?? 0;
//if (x.DueDate != null) //if (x.DueDate != null)
// x.DueDate1 = x.DueDate.Value.ToString("yyyy-MM-dd"); // x.DueDate1 = x.DueDate.Value.ToString("yyyy-MM-dd");
//if (x.ExamDate != null) //if (x.ExamDate != null)
@ -153,12 +154,28 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
if (examPaper != null) if (examPaper != null)
entity.IsPass = examPaper.PassScore > (entity.Score + entity.AdjustScore) ? false : true; entity.IsPass = examPaper.PassScore > (entity.Score + entity.AdjustScore) ? false : true;
await Update(entity); await Update(entity, ["IsPass", "AdjustScore"]);
return ServiceResult.OprateSuccess("修改成功！"); return ServiceResult.OprateSuccess("修改成功！");
//return await QueryFilterPage(body, $"ExamId='{examId}'"); //return await QueryFilterPage(body, $"ExamId='{examId}'");
} }
public async Task<ServiceResult> ModifyActualScore(string examRecordId, EditGhre_ExamRecordInput edit)
{
var entity = await QuerySingle(examRecordId);
if (edit.ActualScore < 0)
return ServiceResult.OprateFailed($"实操分为【{edit.ActualScore}】,分数不可小于0！");
entity.ActualScore = edit.ActualScore;
//string score1 = Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "");
await Update(entity, ["ActualScore"]);
return ServiceResult.OprateSuccess("修改成功！");
}
public async Task<ServiceResult<Ghre_ExamRecordExtend>> ExtendAsync(long examRecordId) public async Task<ServiceResult<Ghre_ExamRecordExtend>> ExtendAsync(long examRecordId)
{ {
var extend = new Ghre_ExamRecordExtend(); var extend = new Ghre_ExamRecordExtend();

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

@ -4285,16 +4285,6 @@
来源 来源
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.RemarkSz"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.RemarkSz">
<summary> <summary>
备注 备注
@ -4365,6 +4355,21 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.ActualScore">
<summary>
实操分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase">
<summary> <summary>
Ghre_ExamRecordAnswer (Dto.Base) Ghre_ExamRecordAnswer (Dto.Base)
@ -17786,16 +17791,6 @@
来源 来源
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.RemarkSz"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.RemarkSz">
<summary> <summary>
备注 备注
@ -17866,6 +17861,21 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.IsView">
<summary>
是否查看试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.ViewTime">
<summary>
查看试卷时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.ActualScore">
<summary>
实操分
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer"> <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer">
<summary> <summary>
Ghre_ExamRecordAnswer (Model) Ghre_ExamRecordAnswer (Model)

Write Preview
Loading…
Cancel
Save