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

修改

Uat_Study
he 2022-05-05 14:24:07 +08:00
parent ca44f1ea82
commit b2984125c5
1 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,15 +78,14 @@ namespace IRaCIS.Core.Application.Service.Inspection
from lefttrialSign in trialSigntemp.DefaultIfEmpty()
join frontAuditConfig in _repository.GetQueryable<FrontAuditConfig>().Where(x=>x.ConfigType=="M"&&x.Identification!=null) on new
join leftfrontAuditConfig in _repository.GetQueryable<FrontAuditConfig>().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
/// <returns></returns>
public async Task<dynamic> 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<TrialSign>(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<TrialSign>(t => t.Id == signId, u => new TrialSign() { IsCompleted = true });
//}
//// 判断是否需要前面
//if (AuditInfo.NeedSava)
//{
// await AddInspectionRecordAsync(AuditInfo, signId);
//}
return bResult;
//return bResult;
}