IRaCIS.Core.Application/Service/Document/DTO/TrialFinalRecordViewModel.cs

@@ -8,8 +8,6 @@ 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
@@ -49,39 +47,22 @@ public class TrialFinalRecordAddOrEdit
     /// <summary>
     /// 定稿PDF
     /// </summary>
-    public TrialFileDto PDFFileRecord { get; set; }
+    public TrialFile 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
@@ -92,8 +73,10 @@ public class TrialFinalRecordQuery : PageInput
     
     public string? Name { get; set; }
 
-    [NotDefault]
+    
-    public Guid TrialFileTypeId { get; set; }
+    public int? State { get; set; }
+    
+    public Guid? TrialFileTypeId { get; set; }
     
     public Guid? TrialId { get; set; }
     

IRaCIS.Core.Application/Service/Document/TrialFinalRecordService.cs

@@ -31,7 +31,6 @@ 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)
@@ -48,15 +47,8 @@ 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);
 

IRaCIS.Core.Application/Service/Document/_MapConfig.cs

@@ -57,9 +57,6 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialUserRole, TrialDocumentUserConfirmView>();
 
-            CreateMap<TrialFileDto, TrialFile>();
-            CreateMap<TrialFile, TrialFileDto>();
-
             CreateMap<BatchAddTrialEmailNoticeConfig, TrialEmailNoticeConfig>();
 
             CreateMap<TrialSelectEmailNoticeConfigView, BatchAddTrialEmailNoticeConfig > ();