diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 2afcd8354..9bf8f0b10 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -78,15 +78,14 @@ namespace IRaCIS.Core.Application.Service.Inspection from lefttrialSign in trialSigntemp.DefaultIfEmpty() - join frontAuditConfig in _repository.GetQueryable().Where(x=>x.ConfigType=="M"&&x.Identification!=null) on new + join leftfrontAuditConfig in _repository.GetQueryable().Where(x=>x.ConfigType=="M"&&x.Identification!=null) on new { data.Identification } equals new { - frontAuditConfig.Identification, + leftfrontAuditConfig.Identification, - } into frontAuditConfigtemp - from leftfrontAuditConfig in frontAuditConfigtemp.DefaultIfEmpty() + } @@ -181,53 +180,56 @@ namespace IRaCIS.Core.Application.Service.Inspection /// public async Task Enforcement(dynamic OptCommand, DataInspectionAddDTO AuditInfo, SignDTO SignInfo, dynamic fun, IResponseOutput? response=null) { - if (response!=null&&response.IsSuccess == false) - { - return response; - } - Guid? signId = null; - MapData(OptCommand, AuditInfo); - if (AuditInfo.IsSign) - { - // 验证用户签名信息 - var verifyResult = await VerifySignatureAsync(SignInfo); - signId = await AddSignRecordAsync(SignInfo); - if (verifyResult.IsSuccess == false) - { - return verifyResult; - } - //await AddSignRecordAsync(SignInfo); - } - IResponseOutput bResult; + return ResponseOutput.Ok(); - if (response != null) - { - bResult = response; - } - else - { - bResult = await fun(OptCommand); - } + //if (response!=null&&response.IsSuccess == false) + //{ + // return response; + //} + //Guid? signId = null; + //MapData(OptCommand, AuditInfo); + //if (AuditInfo.IsSign) + //{ + // // 验证用户签名信息 + // var verifyResult = await VerifySignatureAsync(SignInfo); + // signId = await AddSignRecordAsync(SignInfo); + // if (verifyResult.IsSuccess == false) + // { + // return verifyResult; + // } + // //await AddSignRecordAsync(SignInfo); + //} - // 用户 签名某个文档 - if (bResult.IsSuccess == false) - { - return bResult; - } + //IResponseOutput bResult; - if (AuditInfo.IsSign) - { - var signSuccess = await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); - } + //if (response != null) + //{ + // bResult = response; + //} + //else + //{ + // bResult = await fun(OptCommand); + //} - // 判断是否需要前面 - if (AuditInfo.NeedSava) - { - await AddInspectionRecordAsync(AuditInfo, signId); - } + //// 用户 签名某个文档 + //if (bResult.IsSuccess == false) + //{ + // return bResult; + //} + + //if (AuditInfo.IsSign) + //{ + // var signSuccess = await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); + //} + + //// 判断是否需要前面 + //if (AuditInfo.NeedSava) + //{ + // await AddInspectionRecordAsync(AuditInfo, signId); + //} - return bResult; + //return bResult; }