字段修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-03-03 13:56:01 +08:00
parent aec94d0a46
commit 398baea876
6 changed files with 19198 additions and 11 deletions

View File

@ -30,7 +30,7 @@ public class TrialNormalRecordAddOrEdit
public TrialFileDto? TrialFileRecord { get; set; } public TrialFileDto? TrialFileRecord { get; set; }
public TrialFileDto? HistoryFile { get; set; } public TrialFileDto? HistoryFileRecord { get; set; }
public Guid TrialFileTypeId { get; set; } public Guid TrialFileTypeId { get; set; }

View File

@ -46,7 +46,7 @@ public class TrialNormalRecordService(IRepository<TrialNormalRecord> _trialNorma
public async Task<IResponseOutput> AddOrUpdateTrialNormalRecord(TrialNormalRecordAddOrEdit inDto) public async Task<IResponseOutput> AddOrUpdateTrialNormalRecord(TrialNormalRecordAddOrEdit inDto)
{ {
if (inDto.TrialFileRecord != null) inDto.TrialFileRecord.TrialFileTypeId = inDto.TrialFileTypeId; if (inDto.TrialFileRecord != null) inDto.TrialFileRecord.TrialFileTypeId = inDto.TrialFileTypeId;
if (inDto.HistoryFile != null) inDto.HistoryFile.TrialFileTypeId = inDto.TrialFileTypeId; if (inDto.HistoryFileRecord != null) inDto.HistoryFileRecord.TrialFileTypeId = inDto.TrialFileTypeId;
if (inDto.Id != null) if (inDto.Id != null)
@ -55,7 +55,7 @@ public class TrialNormalRecordService(IRepository<TrialNormalRecord> _trialNorma
List<Guid?> ids = new List<Guid?>() { List<Guid?> ids = new List<Guid?>() {
trialFinalRecord.TrialFileRecordId, trialFinalRecord.TrialFileRecordId,
trialFinalRecord.HistoryFileId, trialFinalRecord.HistoryFileRecordId,
}; };
var fileIds = ids.Where(x => x != null).Select(x => (Guid)x).ToList(); var fileIds = ids.Where(x => x != null).Select(x => (Guid)x).ToList();

View File

@ -101,8 +101,8 @@ public class TrialNormalRecord : BaseFullAuditEntity
/// 历史文件记录 /// 历史文件记录
/// </summary> /// </summary>
[JsonIgnore] [JsonIgnore]
[ForeignKey("HistoryFileId")] [ForeignKey("HistoryFileRecordId")]
public TrialFile HistoryFile { get; set; } public TrialFile HistoryFileRecord { get; set; }
[Comment("关联项目文件类型")] [Comment("关联项目文件类型")]
public Guid TrialFileTypeId { get; set; } public Guid TrialFileTypeId { get; set; }
@ -120,7 +120,7 @@ public class TrialNormalRecord : BaseFullAuditEntity
public Guid? TrialFileRecordId { get; set; } public Guid? TrialFileRecordId { get; set; }
[Comment("历史文件")] [Comment("历史文件")]
public Guid? HistoryFileId { get; set; } public Guid? HistoryFileRecordId { get; set; }

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,60 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class HistoryFileRecord : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_TrialNormalRecord_TrialFile_HistoryFileId",
table: "TrialNormalRecord");
migrationBuilder.RenameColumn(
name: "HistoryFileId",
table: "TrialNormalRecord",
newName: "HistoryFileRecordId");
migrationBuilder.RenameIndex(
name: "IX_TrialNormalRecord_HistoryFileId",
table: "TrialNormalRecord",
newName: "IX_TrialNormalRecord_HistoryFileRecordId");
migrationBuilder.AddForeignKey(
name: "FK_TrialNormalRecord_TrialFile_HistoryFileRecordId",
table: "TrialNormalRecord",
column: "HistoryFileRecordId",
principalTable: "TrialFile",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_TrialNormalRecord_TrialFile_HistoryFileRecordId",
table: "TrialNormalRecord");
migrationBuilder.RenameColumn(
name: "HistoryFileRecordId",
table: "TrialNormalRecord",
newName: "HistoryFileId");
migrationBuilder.RenameIndex(
name: "IX_TrialNormalRecord_HistoryFileRecordId",
table: "TrialNormalRecord",
newName: "IX_TrialNormalRecord_HistoryFileId");
migrationBuilder.AddForeignKey(
name: "FK_TrialNormalRecord_TrialFile_HistoryFileId",
table: "TrialNormalRecord",
column: "HistoryFileId",
principalTable: "TrialFile",
principalColumn: "Id");
}
}
}

View File

@ -12233,7 +12233,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId") b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("HistoryFileId") b.Property<Guid?>("HistoryFileRecordId")
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasComment("历史文件"); .HasComment("历史文件");
@ -12265,7 +12265,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.HasIndex("CreateUserId"); b.HasIndex("CreateUserId");
b.HasIndex("HistoryFileId"); b.HasIndex("HistoryFileRecordId");
b.HasIndex("TrialFileRecordId"); b.HasIndex("TrialFileRecordId");
@ -17946,9 +17946,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.HasOne("IRaCIS.Core.Domain.Models.TrialFile", "HistoryFile") b.HasOne("IRaCIS.Core.Domain.Models.TrialFile", "HistoryFileRecord")
.WithMany() .WithMany()
.HasForeignKey("HistoryFileId"); .HasForeignKey("HistoryFileRecordId");
b.HasOne("IRaCIS.Core.Domain.Models.TrialFile", "TrialFileRecord") b.HasOne("IRaCIS.Core.Domain.Models.TrialFile", "TrialFileRecord")
.WithMany() .WithMany()
@ -17956,7 +17956,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Navigation("CreateUserRole"); b.Navigation("CreateUserRole");
b.Navigation("HistoryFile"); b.Navigation("HistoryFileRecord");
b.Navigation("TrialFileRecord"); b.Navigation("TrialFileRecord");
}); });