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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-07-25 15:13:46 +08:00
parent 043037328e 0b1a4bb53e
commit 23ec2a6275
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
View File

@ -584,7 +584,7 @@ namespace IRaCIS.Core.API.Controllers
templateFileStream.Seek(0, SeekOrigin.Begin); templateFileStream.Seek(0, SeekOrigin.Begin);
var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/Check", realFileName); var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/Check", realFileName);
await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true); await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true);
@ -824,7 +824,7 @@ namespace IRaCIS.Core.API.Controllers
throw new BusinessValidationFailedException(_localizer["UploadDownLoad_TemplateUploadData"]); throw new BusinessValidationFailedException(_localizer["UploadDownLoad_TemplateUploadData"]);
} }
var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/SiteSurvey", realFileName); var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/SiteSurvey", realFileName);
await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true); await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true);

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

@ -146,7 +146,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
SubjectVisitId = data.SubjectVisitId, SubjectVisitId = data.SubjectVisitId,
//OptType = data.OptType, //OptType = data.OptType,
IP = data.IP, IP = data.IP,
Reason = data.Reason, Reason = leftfrontAuditConfig.IsHaveReason? data.Reason:string.Empty,
IsSign = leftfrontAuditConfig.IsHaveSign && lefttrialSign.SignText != null && lefttrialSign.SignText != string.Empty, IsSign = leftfrontAuditConfig.IsHaveSign && lefttrialSign.SignText != null && lefttrialSign.SignText != string.Empty,
SignId = data.SignId, SignId = data.SignId,
ParentId = data.ParentId, ParentId = data.ParentId,

3
IRaCIS.Core.Domain/Trial/DataInspection.cs
View File

@ -66,6 +66,9 @@ public class DataInspection : BaseAddAuditEntity
[Comment("父ID")] [Comment("父ID")]
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
/// <summary>
/// 原因
/// </summary>
public string Reason { get; set; } = string.Empty; public string Reason { get; set; } = string.Empty;
[Comment("角色名称")] [Comment("角色名称")]