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

查询修改

IRC_NewDev
he 2024-03-12 14:05:14 +08:00
parent 2fe0851786
commit c7abcc153e
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,9 @@ 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,ApiResponseCodeEnum.BusinessValidationFailed)); var error = context.Exception as BusinessValidationFailedException;
context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, error!.Code));
} }
else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException)) else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
{ {

6
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -2600,7 +2600,7 @@ namespace IRaCIS.Application.Services
if (currentSubject == null) if (currentSubject == null)
{ {
throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]); throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
} }
task = currentSubject.UnReadCanReadTaskList.Select(x => new GetReadingTaskDto() task = currentSubject.UnReadCanReadTaskList.Select(x => new GetReadingTaskDto()
@ -2627,7 +2627,7 @@ namespace IRaCIS.Application.Services
var count = await query.CountAsync(); var count = await query.CountAsync();
if (count == 0) if (count == 0)
{ {
throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]); throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
} }
Random random = new Random(); Random random = new Random();
var skipcount = 0; var skipcount = 0;
@ -2653,7 +2653,7 @@ namespace IRaCIS.Application.Services
if (task == null) if (task == null)
{ {
throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]); throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
} }
if (task.SubjectCode.IsNullOrEmpty()) if (task.SubjectCode.IsNullOrEmpty())

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs
View File

@ -285,7 +285,7 @@ namespace IRaCIS.Application.Services
//qusetionList = qusetionList.Where(x => x.ParentId == null).ToList(); //qusetionList = qusetionList.Where(x => x.ParentId == null).ToList();
groupList = qusetionList.Where(x => x.Type == ReadingQestionType.Group || (x.ParentId == null && x.GroupName.IsNullOrEmpty())).ToList(); groupList = qusetionList.Where(x => x.Type == ReadingQestionType.Group ).ToList();
groupList.ForEach(x => groupList.ForEach(x =>
{ {
this.FindSystemChildQuestion(x, qusetionList, tableQuestionList); this.FindSystemChildQuestion(x, qusetionList, tableQuestionList);

13
IRaCIS.Core.Infrastructure/_IRaCIS/Exception/BusinessValidationFailedException.cs
View File

@ -1,17 +1,22 @@
using System; using IRaCIS.Core.Infrastructure.Extention;
using System;
namespace IRaCIS.Core.Infrastructure namespace IRaCIS.Core.Infrastructure
{ {
public class BusinessValidationFailedException : Exception public class BusinessValidationFailedException : Exception
{ {
public BusinessValidationFailedException() public ApiResponseCodeEnum Code { get; set; }
public BusinessValidationFailedException()
{ {
} }
public BusinessValidationFailedException( string message) : base(message) public BusinessValidationFailedException(string message, ApiResponseCodeEnum code = ApiResponseCodeEnum.BusinessValidationFailed) : base(message)
{ {
} Code = code;
}
} }
} }

1
IRaCIS.Core.Infrastructure/_IRaCIS/Output/ApiResponseCodeEnum.cs
View File

@ -30,6 +30,7 @@ namespace IRaCIS.Core.Infrastructure.Extention
NeedTips = 5, NeedTips = 5,
CloseCurrentWindows=6,