From 172cecebe49fcb46b9e00cf8be16b1cc8336189c Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 25 Feb 2025 11:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Document/DTO/TrialFinalRecordViewModel.cs | 33 ++++++++++++++-----
 .../Document/TrialFinalRecordService.cs       | 10 +++++-
 .../Service/Document/_MapConfig.cs            |  3 ++
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialFinalRecordViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialFinalRecordViewModel.cs
index 442e610ae..7e850889d 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialFinalRecordViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialFinalRecordViewModel.cs
@@ -8,6 +8,8 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.ViewModel;
 
 public class TrialFinalRecordView : TrialFinalRecordAddOrEdit
@@ -47,22 +49,39 @@ public class TrialFinalRecordAddOrEdit
     /// <summary>
     /// 定稿PDF
     /// </summary>
-    public TrialFile PDFFileRecord { get; set; }
+    public TrialFileDto PDFFileRecord { get; set; }
 
     /// <summary>
     /// 定稿Word
     /// </summary>
-    public TrialFile WordFileRecord { get; set; }
+
+    public TrialFileDto WordFileRecord { get; set; }
 
     /// <summary>
     /// 签名页
     /// </summary>
-    public TrialFile SignFileRecord { get; set; }
+
+    public TrialFileDto SignFileRecord { get; set; }
 
     /// <summary>
     /// 历史记录
     /// </summary>
-    public TrialFile HistoryFileRecord { get; set; }
+
+    public TrialFileDto HistoryFileRecord { get; set; }
+}
+
+
+public class TrialFileDto
+{
+    public Guid TrialFileTypeId { get; set; }
+
+    public string FileName { get; set; }
+
+    public string FilePath { get; set; }
+
+    public string FileSize { get; set; }
+
+    public string FileFormat { get; set; }
 }
 
 public class TrialFinalRecordQuery : PageInput
@@ -73,10 +92,8 @@ public class TrialFinalRecordQuery : PageInput
     
     public string? Name { get; set; }
 
-    
-    public int? State { get; set; }
-    
-    public Guid? TrialFileTypeId { get; set; }
+    [NotDefault]
+    public Guid TrialFileTypeId { get; set; }
     
     public Guid? TrialId { get; set; }
     
diff --git a/IRaCIS.Core.Application/Service/Document/TrialFinalRecordService.cs b/IRaCIS.Core.Application/Service/Document/TrialFinalRecordService.cs
index 10151548c..def246946 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialFinalRecordService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialFinalRecordService.cs
@@ -31,6 +31,7 @@ public class TrialFinalRecordService(IRepository<TrialFinalRecord> _trialFinalRe
     {
 
         var trialFinalRecordQueryable = _trialFinalRecordRepository
+            .Where(x=>x.TrialFileTypeId==inDto.TrialFileTypeId)
             .WhereIf(inDto.Name.IsNotNullOrEmpty(),x=>x.Name.Contains(inDto.Name))
             .WhereIf(inDto.Version.IsNotNullOrEmpty(), x => x.Version.Contains(inDto.Version))
             .WhereIf(inDto.IsAuthorizedView!=null, x => x.IsAuthorizedView==inDto.IsAuthorizedView)
@@ -47,8 +48,15 @@ public class TrialFinalRecordService(IRepository<TrialFinalRecord> _trialFinalRe
     {
         //  在此处拷贝automapper 映射
 
-    
 
+        var verifyExp = new EntityVerifyExp<TrialFinalRecord>()
+        {
+            VerifyExp = u => u.Name == addOrEditTrialFinalRecord.Name,
+
+            // "当前类型启用的文件类型名称重复"
+            VerifyMsg = _localizer["TrialFileType_NameRepeat"],
+          
+        };
 
         var entity = await _trialFinalRecordRepository.InsertOrUpdateAsync(addOrEditTrialFinalRecord, true);
 
diff --git a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
index 1d56898c1..28e4a6cb0 100644
--- a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
@@ -57,6 +57,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialUserRole, TrialDocumentUserConfirmView>();
 
+            CreateMap<TrialFileDto, TrialFile>();
+            CreateMap<TrialFile, TrialFileDto>();
+
             CreateMap<BatchAddTrialEmailNoticeConfig, TrialEmailNoticeConfig>();
 
             CreateMap<TrialSelectEmailNoticeConfigView, BatchAddTrialEmailNoticeConfig > ();