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

修改

Browse Source
This commit is contained in:
he
2023-05-06 15:06:06 +08:00
parent 63572942ea
commit 73862c10c5
8 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.API/Controllers/FinancialChangeController.cs
+10 -6
View File
@@ -12,6 +12,7 @@ using IRaCIS.Core.Application.Service.Inspection.DTO;
using IRaCIS.Core.Infra.EFCore;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Application.Auth;
using Microsoft.Extensions.Localization;
namespace IRaCIS.Core.API.Controllers.Special
{
@@ -22,11 +23,12 @@ namespace IRaCIS.Core.API.Controllers.Special
{
private readonly ITrialService _trialService;
private readonly ICalculateService _calculateService;
public FinancialChangeController(ITrialService trialService, ICalculateService calculateService
)
private IStringLocalizer _localizer { get; set; }
public FinancialChangeController(ITrialService trialService, ICalculateService calculateService, IStringLocalizer localizer
)
{
_trialService = trialService;
_localizer = localizer;
_trialService = trialService;
_calculateService = calculateService;
}
@@ -124,7 +126,8 @@ namespace IRaCIS.Core.API.Controllers.Special
if (isLock)
{
return ResponseOutput.NotOk("Expenses have been settled and workload can not be reset.");
//---Expenses have been settled and workload can not be reset.
return ResponseOutput.NotOk(_localizer["Financial_ChargeSettled"]);
}
var deleteResult = await _trialWorkloadService.DeleteWorkload(id);
@@ -300,7 +303,8 @@ namespace IRaCIS.Core.API.Controllers.Special
{
if (!ModelState.IsValid)
{
return ResponseOutput.NotOk("Invalid parameter.");
//---Invalid parameter.
return ResponseOutput.NotOk(_localizer["Financial_InvalidParameter"]);
}
return await _calculateService.CalculateMonthlyPayment(param, User.FindFirst("id").Value);
}
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+12 -6
View File
@@ -286,7 +286,8 @@ namespace IRaCIS.Core.API.Controllers
!MediaTypeHeaderValue.TryParse(HttpContext.Request.ContentType, out var mediaTypeHeader) ||
string.IsNullOrEmpty(mediaTypeHeader.Boundary.Value))
{
return ResponseOutput.NotOk("不支持的MediaType");
//---不支持的MediaType
return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_UnsupportedMedia"));
}
var archiveStudyCommand = new ArchiveStudyCommand() { AbandonStudyId = abandonStudyId, StudyInstanceUid = studyInstanceUid, SubjectVisitId = subjectVisitId };
@@ -297,7 +298,8 @@ namespace IRaCIS.Core.API.Controllers
if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}"))
{
return ResponseOutput.NotOk("当前已有人正在上传和归档该检查!");
//---当前已有人正在上传和归档该检查!
return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress"));
}
else
{
@@ -370,7 +372,8 @@ namespace IRaCIS.Core.API.Controllers
{
_provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}");
throw new BusinessValidationFailedException("请求异常,请重试！");
//---请求异常,请重试！
throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_RequestError"));
}
studyMonitor.FileSize = (decimal)HttpContext.Request.ContentLength;
@@ -741,7 +744,8 @@ namespace IRaCIS.Core.API.Controllers
if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".csv") && !fileName.EndsWith(".xls"))
{
throw new BusinessValidationFailedException("支持.xlsx、.xls、.csv格式的文件上传。");
//---支持.xlsx、.xls、.csv格式的文件上传。
throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_SupportedFormats"));
}
(serverFilePath, relativePath) = FileStoreHelper.GetTrialCheckFilePath(_hostEnvironment, fileName, trialId);
@@ -881,7 +885,8 @@ namespace IRaCIS.Core.API.Controllers
if (etcCheckList == null || etcCheckList.Count == 0)
{
return ResponseOutput.NotOk("请保证上传数据符合模板文件中的样式，且存在有效数据。");
//---请保证上传数据符合模板文件中的样式，且存在有效数据。
return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_InvalidData"));
}
else
{
@@ -901,7 +906,8 @@ namespace IRaCIS.Core.API.Controllers
if (etcCheckList.Count == 0)
{
return ResponseOutput.NotOk("请保证上传数据符合模板文件中的样式，且存在有效数据。");
//---请保证上传数据符合模板文件中的样式，且存在有效数据。
return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_InvalidData"));
}
}