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. 397
      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);
}
#endregion
[HttpPost("ModifyAdjustScore/{examRecordId}")]
@ -40,6 +39,12 @@ public class Ghre_ExamRecordController : BaseController<IGhre_ExamRecordServices
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>

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

@ -4285,16 +4285,6 @@
来源
</summary>
</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">
<summary>
备注
@ -4365,6 +4355,21 @@
预留字段12
</summary>
</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">
<summary>
Ghre_ExamRecordAnswer (Dto.Base)
@ -17786,16 +17791,6 @@
来源
</summary>
</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">
<summary>
备注
@ -17866,6 +17861,21 @@
预留字段12
</summary>
</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">
<summary>
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> ViewExamPaperCallBackAsync(long examRecordId);
Task<ServiceResult> ModifyActualScore(string examRecordId, EditGhre_ExamRecordInput edit);
}

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

@ -6,212 +6,213 @@
*
* 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.
*┌──────────────────────────────────┐
*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
*│　作者：SimonHsiao │
*└──────────────────────────────────┘
*/
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
*/
namespace Tiobon.Core.Model.Models;
namespace Tiobon.Core.Model.Models
/// <summary>
/// 考试记录 (Dto.Base)
/// </summary>
public class Ghre_ExamRecordBase
{
/// <summary>
/// 考试记录 (Dto.Base)
/// </summary>
public class Ghre_ExamRecordBase
{
/// <summary>
/// 试卷ID
/// </summary>
public long? ExamId { get; set; }
/// <summary>
/// 培训记录ID
/// </summary>
public long? StudyRecordId { get; set; }
/// <summary>
/// 员工ID
/// </summary>
public int? StaffId { get; set; }
/// <summary>
/// 课程快照ID
/// </summary>
public long? CourseSnapId { get; set; }
/// <summary>
/// 试卷ID
/// </summary>
public long? ExamPaperId { get; set; }
/// <summary>
/// 得分
/// </summary>
[Display(Name = "Score"), Description("得分"), Column(TypeName = "decimal(20,2)")]
public decimal? Score { get; set; }
/// <summary>
/// 调整得分
/// </summary>
[Display(Name = "AdjustScore"), Description("调整得分"), Column(TypeName = "decimal(20,2)")]
public decimal? AdjustScore { get; set; }
/// <summary>
/// 考试日期
/// </summary>
public DateTime? ExamDate { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime? BeginTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// 实际开始时间
/// </summary>
public DateTime? ActualBeginTime { get; set; }
/// <summary>
/// 实际结束时间
/// </summary>
public DateTime? ActualEndTime { get; set; }
/// <summary>
/// 重考次数
/// </summary>
public int? RetakeTimes { get; set; }
/// <summary>
/// 状态
/// </summary>
[Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
public string Status { get; set; }
/// <summary>
/// 评分状态
/// </summary>
[Display(Name = "ScoreStatus"), Description("评分状态"), MaxLength(32, ErrorMessage = "评分状态 不能超过 32 个字符")]
public string ScoreStatus { get; set; }
/// <summary>
/// 评语
/// </summary>
[Display(Name = "Comment"), Description("评语"), MaxLength(2000, ErrorMessage = "评语 不能超过 2000 个字符")]
public string Comment { get; set; }
/// <summary>
/// 是否合格
/// </summary>
public bool? IsPass { get; set; }
/// <summary>
/// 来源
/// </summary>
[Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")]
public string Source { get; set; }
/// <summary>
/// 是否查看试卷
/// </summary>
public bool? IsView { get; set; }
/// <summary>
/// 查看试卷时间
/// </summary>
public DateTime? ViewTime { get; set; }
/// <summary>
/// 备注
/// </summary>
[Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
public string RemarkSz { get; set; }
/// <summary>
/// 默认标志
/// </summary>
public int? IsDefault { get; set; }
/// <summary>
/// 预留字段1
/// </summary>
[Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
public string Reverse1 { get; set; }
/// <summary>
/// 预留字段2
/// </summary>
[Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
public string Reverse2 { get; set; }
/// <summary>
/// 预留字段3
/// </summary>
[Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
public string Reverse3 { get; set; }
/// <summary>
/// 预留字段4
/// </summary>
[Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
public string Reverse4 { get; set; }
/// <summary>
/// 预留字段5
/// </summary>
[Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
public string Reverse5 { get; set; }
/// <summary>
/// 预留字段6
/// </summary>
[Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
public string Reverse6 { get; set; }
/// <summary>
/// 预留字段7
/// </summary>
[Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
public string Reverse7 { get; set; }
/// <summary>
/// 预留字段8
/// </summary>
[Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
public string Reverse8 { get; set; }
/// <summary>
/// 预留字段9
/// </summary>
[Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
public string Reverse9 { get; set; }
/// <summary>
/// 预留字段10
/// </summary>
[Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
public string Reverse10 { get; set; }
/// <summary>
/// 预留字段11
/// </summary>
public int? ReverseI1 { get; set; }
/// <summary>
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
}
/// 试卷ID
/// </summary>
public long? ExamId { get; set; }
/// <summary>
/// 培训记录ID
/// </summary>
public long? StudyRecordId { get; set; }
/// <summary>
/// 员工ID
/// </summary>
public int? StaffId { get; set; }
/// <summary>
/// 课程快照ID
/// </summary>
public long? CourseSnapId { get; set; }
/// <summary>
/// 试卷ID
/// </summary>
public long? ExamPaperId { get; set; }
/// <summary>
/// 得分
/// </summary>
[Display(Name = "Score"), Description("得分"), Column(TypeName = "decimal(20,2)")]
public decimal? Score { get; set; }
/// <summary>
/// 调整得分
/// </summary>
[Display(Name = "AdjustScore"), Description("调整得分"), Column(TypeName = "decimal(20,2)")]
public decimal? AdjustScore { get; set; }
/// <summary>
/// 考试日期
/// </summary>
public DateTime? ExamDate { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime? BeginTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// 实际开始时间
/// </summary>
public DateTime? ActualBeginTime { get; set; }
/// <summary>
/// 实际结束时间
/// </summary>
public DateTime? ActualEndTime { get; set; }
/// <summary>
/// 重考次数
/// </summary>
public int? RetakeTimes { get; set; }
/// <summary>
/// 状态
/// </summary>
[Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
public string Status { get; set; }
/// <summary>
/// 评分状态
/// </summary>
[Display(Name = "ScoreStatus"), Description("评分状态"), MaxLength(32, ErrorMessage = "评分状态 不能超过 32 个字符")]
public string ScoreStatus { get; set; }
/// <summary>
/// 评语
/// </summary>
[Display(Name = "Comment"), Description("评语"), MaxLength(2000, ErrorMessage = "评语 不能超过 2000 个字符")]
public string Comment { get; set; }
/// <summary>
/// 是否合格
/// </summary>
public bool? IsPass { get; set; }
/// <summary>
/// 来源
/// </summary>
[Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")]
public string Source { get; set; }
/// <summary>
/// 备注
/// </summary>
[Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
public string RemarkSz { get; set; }
/// <summary>
/// 默认标志
/// </summary>
public int? IsDefault { get; set; }
/// <summary>
/// 预留字段1
/// </summary>
[Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
public string Reverse1 { get; set; }
/// <summary>
/// 预留字段2
/// </summary>
[Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
public string Reverse2 { get; set; }
/// <summary>
/// 预留字段3
/// </summary>
[Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
public string Reverse3 { get; set; }
/// <summary>
/// 预留字段4
/// </summary>
[Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
public string Reverse4 { get; set; }
/// <summary>
/// 预留字段5
/// </summary>
[Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
public string Reverse5 { get; set; }
/// <summary>
/// 预留字段6
/// </summary>
[Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
public string Reverse6 { get; set; }
/// <summary>
/// 预留字段7
/// </summary>
[Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
public string Reverse7 { get; set; }
/// <summary>
/// 预留字段8
/// </summary>
[Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
public string Reverse8 { get; set; }
/// <summary>
/// 预留字段9
/// </summary>
[Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
public string Reverse9 { get; set; }
/// <summary>
/// 预留字段10
/// </summary>
[Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
public string Reverse10 { get; set; }
/// <summary>
/// 预留字段11
/// </summary>
public int? ReverseI1 { get; set; }
/// <summary>
/// 预留字段12
/// </summary>
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 变更日期 负责人 变更内容
* ───────────────────────────────────
*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.
*┌──────────────────────────────────┐
@ -120,16 +120,6 @@ public class Ghre_ExamRecord : BasePoco
[Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")]
public string Source { get; set; }
/// <summary>
/// 是否查看试卷
/// </summary>
public bool? IsView { get; set; }
/// <summary>
/// 查看试卷时间
/// </summary>
public DateTime? ViewTime { get; set; }
/// <summary>
/// 备注
/// </summary>
@ -210,4 +200,20 @@ public class Ghre_ExamRecord : BasePoco
/// 预留字段12
/// </summary>
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.AdjustScore ?? 0;
x.TotalScore += x.ActualScore ?? 0;
//if (x.DueDate != null)
// x.DueDate1 = x.DueDate.Value.ToString("yyyy-MM-dd");
//if (x.ExamDate != null)
@ -153,12 +154,28 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
if (examPaper != null)
entity.IsPass = examPaper.PassScore > (entity.Score + entity.AdjustScore) ? false : true;
await Update(entity);
await Update(entity, ["IsPass", "AdjustScore"]);
return ServiceResult.OprateSuccess("修改成功！");
//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)
{
var extend = new Ghre_ExamRecordExtend();

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

@ -4285,16 +4285,6 @@
来源
</summary>
</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">
<summary>
备注
@ -4365,6 +4355,21 @@
预留字段12
</summary>
</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">
<summary>
Ghre_ExamRecordAnswer (Dto.Base)
@ -17786,16 +17791,6 @@
来源
</summary>
</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">
<summary>
备注
@ -17866,6 +17861,21 @@
预留字段12
</summary>
</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">
<summary>
Ghre_ExamRecordAnswer (Model)

Write Preview
Loading…
Cancel
Save