From 9a8265af3d6fddeb2dff0bb072c1662f0817242e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 10 May 2022 10:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/InspectionController.cs       | 24 +++++++++----------
 .../IRaCIS.Core.Application.xml               |  4 ++--
 .../Service/Inspection/DTO/InspectionModel.cs |  5 ++--
 .../Service/Inspection/InspectionService.cs   | 10 ++++----
 .../Interface/IInspectionService.cs           |  2 +-
 .../Common/AuditingData.cs                    |  2 ++
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index 5efcf7435..15ef2d686 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -107,7 +107,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> ConfigTrialBasicInfo(DataInspectionDto<BasicTrialConfig> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _trialConfigService.ConfigTrialBasicInfo(opt.Data);
         }
 
@@ -121,7 +121,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> ConfigTrialBasicInfoConfirm(DataInspectionDto<BasicTrialConfig> opt)
         {
 
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             var data = await _trialConfigService.ConfigTrialBasicInfo(opt.Data);
             if (!data.IsSuccess)
             {
@@ -145,7 +145,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> TrialConfigSignatureConfirm(DataInspectionDto<SignConfirmDTO> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _trialConfigService.TrialConfigSignatureConfirm(opt.Data);
         }
 
@@ -160,7 +160,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> ConfigTrialProcessInfo(DataInspectionDto<TrialProcessConfig> opt)
         {
 
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _trialConfigService.ConfigTrialProcessInfo(opt.Data);
         }
 
@@ -174,7 +174,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> ConfigTrialProcessInfoConfirm(DataInspectionDto<TrialProcessConfig> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             var data = await _trialConfigService.ConfigTrialProcessInfo(opt.Data);
             if (!data.IsSuccess)
             {
@@ -199,7 +199,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> ConfigTrialUrgentInfo(DataInspectionDto<TrialUrgentConfig> opt)
         {
 
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _trialConfigService.ConfigTrialUrgentInfo(opt.Data);
         }
 
@@ -214,7 +214,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> ConfigTrialUrgentInfoConfirm(DataInspectionDto<TrialUrgentConfig> opt)
         {
 
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
 
             var data = await _trialConfigService.ConfigTrialUrgentInfo(opt.Data);
             if (!data.IsSuccess)
@@ -238,7 +238,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> CRCRequestToQC(DataInspectionDto<CRCRequestToQCCommand> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _qCOperationService.CRCRequestToQC(opt.Data);
         }
 
@@ -250,7 +250,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> QCPassedOrFailed(DataInspectionDto<QCPassedOrFailedDto> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
         }
 
@@ -261,7 +261,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> CheckBack(DataInspectionDto<IDDto> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _qCOperationService.CheckBack(opt.Data.Id);
         }
 
@@ -274,7 +274,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> SetReuploadFinished(DataInspectionDto<CRCReuploadFinishedCommand> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _qCOperationService.SetReuploadFinished(opt.Data);
         }
 
@@ -287,7 +287,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> UpdateTrialState(DataInspectionDto<UpdateTrialStateDto> opt)
         {
-            await _inspectionService.RecordSing(opt.SignCodeId);
+            await _inspectionService.RecordSing(opt.SignInfo);
             return await _trialConfigService.UpdateTrialState(opt.Data.trialId, opt.Data.trialStatusStr, opt.Data.reason);
         }
 
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 895218860..be5d54b18 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -312,11 +312,11 @@
             是否有签名
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.Inspection.InspectionService.RecordSing(System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Service.Inspection.InspectionService.RecordSing(IRaCIS.Core.Application.Contracts.SignDTO)">
             <summary>
             传入参数记录ID
             </summary>
-            <param name="SignId"></param>
+            <param name="SignInfo"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Inspection.InspectionService.Enforcement(System.Object,IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO,IRaCIS.Core.Application.Contracts.SignDTO,System.Object,IRaCIS.Core.Infrastructure.Extention.IResponseOutput)">
diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index fa47bf203..d3c62f4c7 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -272,13 +272,12 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
     /// <typeparam name="T">泛型</typeparam>
     public class DataInspectionDto<T> 
     {
-      
 
 
         public T Data { get; set; }
 
-        [NotDefault]
-        public Guid SignCodeId { get; set; }
+       
+        public SignDTO SignInfo { get; set; }
 
       
     }
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 09b2e6bf6..1c0b57b64 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -175,12 +175,14 @@ namespace IRaCIS.Core.Application.Service.Inspection
         /// <summary>
         /// 传入参数记录ID
         /// </summary>
-        /// <param name="SignId"></param>
+        /// <param name="SignInfo"></param>
         /// <returns></returns>
-        public async Task RecordSing(Guid SignId)
+        public async Task RecordSing(SignDTO SignInfo)
         {
-            _userInfo.SignId = SignId;
-            await _repository.BatchUpdateAsync<TrialSign>(t => t.Id == SignId, u => new TrialSign() { IsCompleted = true });
+            var verifyResult = await VerifySignatureAsync(SignInfo);
+            var signId = await AddSignRecordAsync(SignInfo);
+            _userInfo.SignId = signId;
+            await _repository.BatchUpdateAsync<TrialSign>(t => t.Id == signId, u => new TrialSign() { IsCompleted = true });
         }
 
         /// <summary>
diff --git a/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs
index 4a0855702..184c9c751 100644
--- a/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs
@@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.Interface
 
         Task<Guid> AddSignRecordAsync(SignDTO signDTO);
 
-         Task RecordSing(Guid SignId);
+         Task RecordSing(SignDTO SignInfo);
         Task<dynamic> Enforcement(dynamic OptCommand, DataInspectionAddDTO AuditInfo, SignDTO SignInfo, dynamic fun, IResponseOutput? response = null);
 
         //Task SetEnum(DataInspectionAddDTO Data);
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 22997f1b7..5183f7c77 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -154,10 +154,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
              
 
                 var subjectCode = entity.Subject?.Code;
+              
                 await InsertInspection<SubjectVisit>(item, type, x => new DataInspection()
                 {
                     SubjectCode= subjectCode,
                     SubjectId=x.SubjectId,
+                   
                     SubjectVisitId = x.Id,
                     SubjectVisitName=x.VisitName,
                     BlindName=x.BlindName,