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

修复

Uat_Study
hang 2022-05-05 13:46:18 +08:00
parent 526af5fb1e
commit d5ae752fd7
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs
View File

@ -27,16 +27,16 @@ namespace IRaCIS.Core.Application.Filter
if (context.Exception.GetType() == typeof(BusinessValidationFailedException)) 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)) 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 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.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);
} }

13
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -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<CheckChallengeDialog>(checkDialogCommand); var qaReply = _mapper.Map<CheckChallengeDialog>(checkDialogCommand);
@ -322,7 +319,7 @@ namespace IRaCIS.Core.Application.Image.QA
} }
else else
{ {
throw new Exception("一致性核查对话操作用户 只允许 CRC/PM"); throw new BusinessValidationFailedException("一致性核查对话操作用户 只允许 CRC/PM");
} }
var success = await _repository.SaveChangesAsync(); 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(); var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == input.subjectVisitId)).IfNullThrowException();
if (sv.RequestBackState == RequestBackStateEnum.PM_AgressBack) if (sv.RequestBackState == RequestBackStateEnum.PM_AgressBack)
{ {
ResponseOutput.NotOk("执行一致性核查的访视 不允许关闭质疑!"); ResponseOutput.NotOk("执行一致性核查的访视 不允许关闭质疑!");
@ -1914,9 +1909,9 @@ namespace IRaCIS.Core.Application.Image.QA
var qcChallenge = (await _qcChallengeRepository.FirstOrDefaultAsync(t => t.Id == qcChallengeId)).IfNullThrowException(); 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重传完成状态，不允许申请重传");
} }