新增调整分接口

Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs

@@ -27,4 +27,10 @@ public class Ghre_ExamRecordController : BaseController<IGhre_ExamRecordServices
     }
 
     #endregion
+
+    [HttpPost, Route("ModifyAdjustScore/{examRecordId}")]
+    public async Task<ServiceResult> ModifyAdjustScore(string examRecordId, [FromBody] EditGhre_ExamRecordInput edit)
+    {
+        return await _service.ModifyAdjustScore(examRecordId, edit);
+    }
 }

Tiobon.Core.IServices/BASE/IBaseServices.cs

@@ -130,7 +130,8 @@ namespace Tiobon.Core.IServices.BASE
         Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpression);
 
         Task<List<TEntityDto>> QueryDto(Expression<Func<TEntity, bool>> whereExpression);
-
+        Task<TEntity> QuerySingle(object objId);
+        Task<TEntity> QuerySingle(Expression<Func<TEntity, bool>> whereExpression);
         Task<TEntityDto> QuerySingleDto(Expression<Func<TEntity, bool>> whereExpression);
         Task<List<TEntity>> Query(Expression<Func<TEntity, bool>> whereExpression, string orderByFields);
         Task<List<TResult>> Query<TResult>(Expression<Func<TEntity, TResult>> expression);

Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs

@@ -11,5 +11,7 @@ namespace Tiobon.Core.IServices
     public interface IGhre_ExamRecordServices :IBaseServices<Ghre_ExamRecord, Ghre_ExamRecordDto, InsertGhre_ExamRecordInput, EditGhre_ExamRecordInput>
 	{
 		Task<ServicePageResult<Ghre_ExamRecordDto>> Query(string examId,   QueryBody body);
+
+        Task<ServiceResult> ModifyAdjustScore(string examRecordId,   EditGhre_ExamRecordInput edit);
     }
 }

Tiobon.Core.Services/BASE/BaseServices.cs

@@ -573,11 +573,22 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
         var data = await BaseDal.Query(whereExpression);
         return Mapper.Map(data).ToANew<List<TEntityDto>>();
     }
-
-    public async Task<TEntityDto> QuerySingleDto(Expression<Func<TEntity, bool>> whereExpression)
+    public virtual async Task<TEntity> QuerySingle(object objId)
+    {
+        var entity = await BaseDal.QueryById(objId);
+        return entity;
+    }
+    public async Task<TEntity> QuerySingle(Expression<Func<TEntity, bool>> whereExpression)
     {
         var entitys = await BaseDal.Query(whereExpression);
         var entity = entitys.FirstOrDefault();
+        if (entity == null)
+            return default;
+        else return entity;
+    }
+    public async Task<TEntityDto> QuerySingleDto(Expression<Func<TEntity, bool>> whereExpression)
+    {
+        var entity = await QuerySingle(whereExpression);
         if (entity == null)
             return default;
         else return Mapper.Map(entity).ToANew<TEntityDto>();

Tiobon.Core.Services/CommonServices.cs

@@ -1062,6 +1062,8 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
             case "F_OnlineExamScores":
                 result.DT_Procedure.QueryProcedure = dt.Rows[0]["QueryProcedure"].ToString();
                 result.DT_Procedure.QueryProcedure += "/" + param.jsonParam.MasterId;
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault();
+                if (toolbar != null) { toolbar.fnKey = "TBD3YN"; }
 
                 sql = $@"SELECT A.RoleId, B.RoleNo, B.RoleName
                     FROM Ghrs_UserRole A LEFT JOIN Ghrs_Role B ON A.RoleId = B.RoleId

Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs

@@ -8,21 +8,25 @@ using Newtonsoft.Json.Linq;
 using Tiobon.Core.Common;
 using Tiobon.Core.Model;
 using Newtonsoft.Json;
-using Microsoft.AspNetCore.Mvc;
+using System.Text.RegularExpressions;
+
+namespace Tiobon.Core.Services;
 
-namespace Tiobon.Core.Services
-{
 /// <summary>
 /// 考试记录 (服务)
 /// </summary>
 public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRecordDto, InsertGhre_ExamRecordInput, EditGhre_ExamRecordInput>, IGhre_ExamRecordServices
 {
     private readonly IBaseRepository<Ghre_ExamRecord> _dal;
-        public Ghre_ExamRecordServices(ICaching caching, IBaseRepository<Ghre_ExamRecord> dal)
+    //private readonly IGhre_ExamPaperServices _ghre_ExamPaperServices;
+    public Ghre_ExamRecordServices(ICaching caching,
+        //IGhre_ExamPaperServices ghre_ExamPaperServices,
+        IBaseRepository<Ghre_ExamRecord> dal)
     {
         this._dal = dal;
         base.BaseDal = dal;
         base._caching = caching;
+        //_ghre_ExamPaperServices = ghre_ExamPaperServices;
     }
 
     public override async Task<ServicePageResult<Ghre_ExamRecordDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
@@ -123,11 +127,32 @@ namespace Tiobon.Core.Services
 
     }
 
-
-
-        public async Task<ServicePageResult<Ghre_ExamRecordDto>> Query(string examId, [FromBody] QueryBody body)
+    public async Task<ServicePageResult<Ghre_ExamRecordDto>> Query(string examId, QueryBody body)
     {
         return await QueryFilterPage(body, $"ExamId='{examId}'");
     }
+
+    public async Task<ServiceResult> ModifyAdjustScore(string examRecordId, EditGhre_ExamRecordInput edit)
+    {
+        var entity = await QuerySingle(examRecordId);
+
+        var paper = await Db.Queryable<Ghre_ExamPaper>().FirstAsync(x => x.Id == entity.ExamPaperId);
+        if (paper == null)
+            return ServiceResult.OprateFailed("该考试管理的试卷已被删除，暂不可变更调整分！");
+
+        entity.AdjustScore = edit.AdjustScore;
+        entity.Score += entity.AdjustScore;
+
+        string score1 = Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "");
+        if (entity.Score < 0)
+            return ServiceResult.OprateFailed($"调整后得分为【{score1}】,得分不可小于0！");
+        if (entity.Score > paper.TotalScore)
+            return ServiceResult.OprateFailed($"调整后得分为【{score1}】,不可大于卷面总分【{Regex.Replace(paper.TotalScore.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(paper.TotalScore.ToString(), @"\.(0+)$", "")}】！");
+
+        await Update(entity);
+
+        return ServiceResult.OprateSuccess("修改成功！");
+
+        //return await QueryFilterPage(body, $"ExamId='{examId}'");
     }
 }