XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改签名

Uat_Study
he 2022-05-10 10:11:28 +08:00
parent 5702a2362e
commit 9a8265af3d
6 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -107,7 +107,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> ConfigTrialBasicInfo(DataInspectionDto<BasicTrialConfig> opt) public async Task<IResponseOutput> ConfigTrialBasicInfo(DataInspectionDto<BasicTrialConfig> opt)
{ {
await _inspectionService.RecordSing(opt.SignCodeId); await _inspectionService.RecordSing(opt.SignInfo);
return await _trialConfigService.ConfigTrialBasicInfo(opt.Data); return await _trialConfigService.ConfigTrialBasicInfo(opt.Data);
} }
@ -121,7 +121,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> ConfigTrialBasicInfoConfirm(DataInspectionDto<BasicTrialConfig> opt) 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); var data = await _trialConfigService.ConfigTrialBasicInfo(opt.Data);
if (!data.IsSuccess) if (!data.IsSuccess)
{ {
@ -145,7 +145,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> TrialConfigSignatureConfirm(DataInspectionDto<SignConfirmDTO> opt) public async Task<IResponseOutput> TrialConfigSignatureConfirm(DataInspectionDto<SignConfirmDTO> opt)
{ {
await _inspectionService.RecordSing(opt.SignCodeId); await _inspectionService.RecordSing(opt.SignInfo);
return await _trialConfigService.TrialConfigSignatureConfirm(opt.Data); return await _trialConfigService.TrialConfigSignatureConfirm(opt.Data);
} }
@ -160,7 +160,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> ConfigTrialProcessInfo(DataInspectionDto<TrialProcessConfig> opt) public async Task<IResponseOutput> ConfigTrialProcessInfo(DataInspectionDto<TrialProcessConfig> opt)
{ {
await _inspectionService.RecordSing(opt.SignCodeId); await _inspectionService.RecordSing(opt.SignInfo);
return await _trialConfigService.ConfigTrialProcessInfo(opt.Data); return await _trialConfigService.ConfigTrialProcessInfo(opt.Data);
} }
@ -174,7 +174,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> ConfigTrialProcessInfoConfirm(DataInspectionDto<TrialProcessConfig> opt) 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); var data = await _trialConfigService.ConfigTrialProcessInfo(opt.Data);
if (!data.IsSuccess) if (!data.IsSuccess)
{ {
@ -199,7 +199,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> ConfigTrialUrgentInfo(DataInspectionDto<TrialUrgentConfig> opt) public async Task<IResponseOutput> ConfigTrialUrgentInfo(DataInspectionDto<TrialUrgentConfig> opt)
{ {
await _inspectionService.RecordSing(opt.SignCodeId); await _inspectionService.RecordSing(opt.SignInfo);
return await _trialConfigService.ConfigTrialUrgentInfo(opt.Data); return await _trialConfigService.ConfigTrialUrgentInfo(opt.Data);
} }
@ -214,7 +214,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> ConfigTrialUrgentInfoConfirm(DataInspectionDto<TrialUrgentConfig> opt) 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); var data = await _trialConfigService.ConfigTrialUrgentInfo(opt.Data);
if (!data.IsSuccess) if (!data.IsSuccess)
@ -238,7 +238,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> CRCRequestToQC(DataInspectionDto<CRCRequestToQCCommand> opt) public async Task<IResponseOutput> CRCRequestToQC(DataInspectionDto<CRCRequestToQCCommand> opt)
{ {
await _inspectionService.RecordSing(opt.SignCodeId); await _inspectionService.RecordSing(opt.SignInfo);
return await _qCOperationService.CRCRequestToQC(opt.Data); return await _qCOperationService.CRCRequestToQC(opt.Data);
} }
@ -250,7 +250,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> QCPassedOrFailed(DataInspectionDto<QCPassedOrFailedDto> opt) 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); return await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
} }
@ -261,7 +261,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> CheckBack(DataInspectionDto<IDDto> opt) 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); return await _qCOperationService.CheckBack(opt.Data.Id);
} }
@ -274,7 +274,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> SetReuploadFinished(DataInspectionDto<CRCReuploadFinishedCommand> opt) public async Task<IResponseOutput> SetReuploadFinished(DataInspectionDto<CRCReuploadFinishedCommand> opt)
{ {
await _inspectionService.RecordSing(opt.SignCodeId); await _inspectionService.RecordSing(opt.SignInfo);
return await _qCOperationService.SetReuploadFinished(opt.Data); return await _qCOperationService.SetReuploadFinished(opt.Data);
} }
@ -287,7 +287,7 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> UpdateTrialState(DataInspectionDto<UpdateTrialStateDto> opt) 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); return await _trialConfigService.UpdateTrialState(opt.Data.trialId, opt.Data.trialStatusStr, opt.Data.reason);
} }

4
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -312,11 +312,11 @@
是否有签名 是否有签名
</summary> </summary>
</member> </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> <summary>
传入参数记录ID 传入参数记录ID
</summary> </summary>
<param name="SignId"></param> <param name="SignInfo"></param>
<returns></returns> <returns></returns>
</member> </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)"> <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)">

5
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -272,13 +272,12 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// <typeparam name="T">泛型</typeparam> /// <typeparam name="T">泛型</typeparam>
public class DataInspectionDto<T> public class DataInspectionDto<T>
{ {
public T Data { get; set; } public T Data { get; set; }
[NotDefault]
public Guid SignCodeId { get; set; } public SignDTO SignInfo { get; set; }
} }

10
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -175,12 +175,14 @@ namespace IRaCIS.Core.Application.Service.Inspection
/// <summary> /// <summary>
/// 传入参数记录ID /// 传入参数记录ID
/// </summary> /// </summary>
/// <param name="SignId"></param> /// <param name="SignInfo"></param>
/// <returns></returns> /// <returns></returns>
public async Task RecordSing(Guid SignId) public async Task RecordSing(SignDTO SignInfo)
{ {
_userInfo.SignId = SignId; var verifyResult = await VerifySignatureAsync(SignInfo);
await _repository.BatchUpdateAsync<TrialSign>(t => t.Id == SignId, u => new TrialSign() { IsCompleted = true }); var signId = await AddSignRecordAsync(SignInfo);
_userInfo.SignId = signId;
await _repository.BatchUpdateAsync<TrialSign>(t => t.Id == signId, u => new TrialSign() { IsCompleted = true });
} }
/// <summary> /// <summary>

2
IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs
View File

@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.Interface
Task<Guid> AddSignRecordAsync(SignDTO signDTO); 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<dynamic> Enforcement(dynamic OptCommand, DataInspectionAddDTO AuditInfo, SignDTO SignInfo, dynamic fun, IResponseOutput? response = null);
//Task SetEnum(DataInspectionAddDTO Data); //Task SetEnum(DataInspectionAddDTO Data);

2
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -154,10 +154,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var subjectCode = entity.Subject?.Code; var subjectCode = entity.Subject?.Code;
await InsertInspection<SubjectVisit>(item, type, x => new DataInspection() await InsertInspection<SubjectVisit>(item, type, x => new DataInspection()
{ {
SubjectCode= subjectCode, SubjectCode= subjectCode,
SubjectId=x.SubjectId, SubjectId=x.SubjectId,
SubjectVisitId = x.Id, SubjectVisitId = x.Id,
SubjectVisitName=x.VisitName, SubjectVisitName=x.VisitName,
BlindName=x.BlindName, BlindName=x.BlindName,