From d5ae752fd74923e3cd8d582a1589f1fc052df2f6 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 5 May 2022 13:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessFilter/ProjectExceptionFilter.cs | 6 +++--- .../Service/QC/QCOperationService.cs | 13 ++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs b/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs index 05836f59c..9115908f6 100644 --- a/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs +++ b/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs @@ -27,16 +27,16 @@ namespace IRaCIS.Core.Application.Filter if (context.Exception.GetType() == typeof(BusinessValidationFailedException)) { - context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message)); + context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message,ApiResponseCodeEnum.BusinessValidationFailed)); } else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException)) { - context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message)); + context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message), ApiResponseCodeEnum.DataNotExist); } else { context.Result = new JsonResult(ResponseOutput.NotOk(" Program exception, please contact the developer! " + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/) - : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)) )); + : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)) ), ApiResponseCodeEnum.ProgramException); } diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index e7bfecb4f..de8bf0fc3 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -299,11 +299,8 @@ namespace IRaCIS.Core.Application.Image.QA { - //修改一致性核查 质疑状态 - var sv = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == checkDialogCommand.SubjectVisitId); - - + var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == checkDialogCommand.SubjectVisitId)).IfNullThrowException(); var qaReply = _mapper.Map(checkDialogCommand); @@ -322,7 +319,7 @@ namespace IRaCIS.Core.Application.Image.QA } else { - throw new Exception("一致性核查对话操作用户 只允许 CRC/PM"); + throw new BusinessValidationFailedException("一致性核查对话操作用户 只允许 CRC/PM"); } var success = await _repository.SaveChangesAsync(); @@ -341,8 +338,6 @@ namespace IRaCIS.Core.Application.Image.QA var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == input.subjectVisitId)).IfNullThrowException(); - - if (sv.RequestBackState == RequestBackStateEnum.PM_AgressBack) { ResponseOutput.NotOk("执行一致性核查的访视 不允许关闭质疑!"); @@ -1914,9 +1909,9 @@ namespace IRaCIS.Core.Application.Image.QA var qcChallenge = (await _qcChallengeRepository.FirstOrDefaultAsync(t => t.Id == qcChallengeId)).IfNullThrowException(); - if (qcChallenge.ReuploadEnum != QCChanllengeReuploadEnum.None || qcChallenge.ReuploadEnum != QCChanllengeReuploadEnum.CRCReuploaded) + if (qcChallenge.ReuploadEnum != QCChanllengeReuploadEnum.None && qcChallenge.ReuploadEnum != QCChanllengeReuploadEnum.CRCReuploaded) { - throw new BusinessValidationFailedException("当前质疑重传状态不为初始状态|CRC重传完成状态状态，不允许申请重传"); + throw new BusinessValidationFailedException("当前质疑重传状态不为初始状态|CRC重传完成状态，不允许申请重传"); }