Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1722,6 +1722,37 @@
             <param name="trialFinalRecordId"></param>
             <returns></returns>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.TrialHistoryRecordFileService">
+            <summary>
+            项目历史记录文件服务
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialHistoryRecordFileService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialHistoryRecordFile},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+            <summary>
+            项目历史记录文件服务
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialHistoryRecordFileService.GetTrialHistoryRecordFileList(IRaCIS.Core.Application.Service.DTO.TrialHistoryRecordFileQuery)">
+            <summary>
+            获取稽查记录文件列表
+            </summary>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialHistoryRecordFileService.AddOrUpdateTrialHistoryRecordFile(IRaCIS.Core.Application.Service.DTO.TrialHistoryRecordFileAddOrEdit)">
+            <summary>
+            新增或修改稽查记录文件
+            </summary>
+            <param name="addOrEditTrialHistoryRecordFile"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialHistoryRecordFileService.DeleteTrialHistoryRecordFile(System.Guid)">
+            <summary>
+            删除稽查记录文件
+            </summary>
+            <param name="trialHistoryRecordFileId"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TrialNormalRecordService">
             <summary>
             项目-一般文件记录

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

@@ -14,7 +14,9 @@ namespace IRaCIS.Core.Application.ViewModel;
 
 public class TrialFinalRecordView : TrialFinalRecordAddOrEdit
 {
-    
+    public int HistoryCount { get; set; }
+
+
     public DateTime CreateTime { get; set; }
     
     public DateTime UpdateTime { get; set; }

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

@@ -0,0 +1,56 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//	   生成时间 2025-06-09 02:09:12Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.Service.DTO;
+
+public class TrialHistoryRecordFileView : TrialHistoryRecordFileAddOrEdit
+{
+    
+    public DateTime CreateTime { get; set; }
+    
+    public DateTime UpdateTime { get; set; }
+    
+}
+
+
+public class TrialHistoryRecordFileAddOrEdit
+{
+    public Guid? Id { get; set; }
+    
+    public string FileFormat { get; set; }
+    
+    public string FileName { get; set; }
+    
+    public string FilePath { get; set; }
+    
+    public string FileSize { get; set; }
+    
+    public Guid TrialFileTypeId { get; set; }
+    
+    public Guid TrialRecordId { get; set; }
+    }
+
+public class TrialHistoryRecordFileQuery:PageInput
+{
+    public string? FileFormat { get; set; }
+    
+    public string? FileName { get; set; }
+    
+    public string? FilePath { get; set; }
+    
+    public string? FileSize { get; set; }
+    
+    public Guid? TrialFileTypeId { get; set; }
+    
+    public Guid? TrialRecordId { get; set; }
+    }
+
+
+
+

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

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.ViewModel;
 
 public class TrialNormalRecordView : TrialNormalRecordAddOrEdit
 {
-    
+    public int HistoryCount { get; set; }
     public DateTime CreateTime { get; set; }
     
     public DateTime UpdateTime { get; set; }

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

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.ViewModel;
 
 public class TrialTrianingRecordView : TrialTrianingRecordAddOrEdit
 {
-    
+    public int HistoryCount { get; set; }
     public DateTime CreateTime { get; set; }
     
     public DateTime UpdateTime { get; set; }

IRaCIS.Core.Application/Service/Document/Interface/ITrialHistoryRecordFileService.cs

@@ -0,0 +1,23 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2025-06-09 02:09:12Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Infrastructure.Extention;
+using System.Threading.Tasks;
+using IRaCIS.Core.Application.Service.DTO;
+namespace IRaCIS.Core.Application.Interfaces;
+
+public interface ITrialHistoryRecordFileService
+{
+
+    Task<PageOutput<TrialHistoryRecordFileView>> GetTrialHistoryRecordFileList(TrialHistoryRecordFileQuery inQuery);
+
+    Task<IResponseOutput> AddOrUpdateTrialHistoryRecordFile(TrialHistoryRecordFileAddOrEdit addOrEditTrialHistoryRecordFile);
+
+    Task<IResponseOutput> DeleteTrialHistoryRecordFile(Guid trialHistoryRecordFileId);
+}
+
+

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

@@ -0,0 +1,78 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2025-06-09 02:09:09Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Infrastructure.Extention;
+using System.Threading.Tasks;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Application.Service.DTO;
+namespace IRaCIS.Core.Application.Service;
+
+/// <summary>
+/// 项目历史记录文件服务
+/// </summary>
+[ApiExplorerSettings(GroupName = "FileRecord")]
+public class TrialHistoryRecordFileService(IRepository<TrialHistoryRecordFile> _trialHistoryRecordFileRepository,
+                                  IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer): BaseService, ITrialHistoryRecordFileService
+{
+
+    /// <summary>
+    /// 获取稽查记录文件列表
+    /// </summary>
+    /// <param name="inQuery"></param>
+    /// <returns></returns>
+    [HttpPost]
+	public async Task<PageOutput<TrialHistoryRecordFileView>>  GetTrialHistoryRecordFileList(TrialHistoryRecordFileQuery inQuery)
+	{
+			
+		    var trialHistoryRecordFileQueryable =_trialHistoryRecordFileRepository
+			.WhereIf(inQuery.TrialRecordId!=null,x=>x.TrialRecordId==inQuery.TrialRecordId)
+            .WhereIf(inQuery.TrialFileTypeId != null, x => x.TrialFileTypeId == inQuery.TrialFileTypeId)
+             .WhereIf(inQuery.FileName.IsNotNullOrEmpty(), x => x.FileName.Contains(x.FileName))
+                                        .ProjectTo<TrialHistoryRecordFileView>(_mapper.ConfigurationProvider);
+
+            var pageList= await trialHistoryRecordFileQueryable.ToPagedListAsync(inQuery);
+
+        return pageList;
+	}
+
+    /// <summary>
+    /// 新增或修改稽查记录文件
+    /// </summary>
+    /// <param name="addOrEditTrialHistoryRecordFile"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async  Task<IResponseOutput> AddOrUpdateTrialHistoryRecordFile(TrialHistoryRecordFileAddOrEdit addOrEditTrialHistoryRecordFile)
+	{
+		    //  在此处拷贝automapper 映射
+			  
+         
+
+
+			var entity = await _trialHistoryRecordFileRepository.InsertOrUpdateAsync(addOrEditTrialHistoryRecordFile, true);
+
+        return ResponseOutput.Ok(entity.Id.ToString());
+		
+	}
+
+    /// <summary>
+    /// 删除稽查记录文件
+    /// </summary>
+    /// <param name="trialHistoryRecordFileId"></param>
+    /// <returns></returns>
+	[HttpDelete("{trialHistoryRecordFileId:guid}")]
+    public async Task<IResponseOutput> DeleteTrialHistoryRecordFile(Guid trialHistoryRecordFileId)
+	{
+			var success = await _trialHistoryRecordFileRepository.DeleteFromQueryAsync(t => t.Id == trialHistoryRecordFileId,true);
+            return ResponseOutput.Ok();
+	}
+      
+}
+
+
+

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

@@ -2,6 +2,7 @@
 using AutoMapper.EquivalencyExpression;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Service.DTO;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Infrastructure.Extention;
 
@@ -124,7 +125,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialFileType, TrialFileTypeAddOrEdit>().ReverseMap();
 
-            CreateMap<TrialFinalRecord, TrialFinalRecordView>();
+            CreateMap<TrialFinalRecord, TrialFinalRecordView>()
+                  .ForMember(d => d.HistoryCount, c => c.MapFrom(t => t.TrialHistoryRecordFileList.Count));
             CreateMap<TrialFinalRecordAddOrEdit, TrialFinalRecord>();
             //.ForMember(d => d.HistoryFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId))
             //.ForMember(d => d.SignFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId))
@@ -132,15 +134,18 @@ namespace IRaCIS.Core.Application.Service
             //.ForMember(d => d.PDFFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId));
 
             CreateMap<TrialNormalRecord, TrialNormalRecordView>()
+                .ForMember(d => d.HistoryCount, c => c.MapFrom(t => t.TrialHistoryRecordFileList.Count))
                   .ForMember(d => d.FileName, c => c.MapFrom(t => t.TrialFileRecord.FileName));
             CreateMap<TrialNormalRecord, TrialNormalRecordAddOrEdit>().ReverseMap();
 
             CreateMap<TrialTrianingRecord, TrialTrianingRecordView>()
+                .ForMember(d => d.HistoryCount, c => c.MapFrom(t => t.TrialHistoryRecordFileList.Count))
             .ForMember(d => d.FileName, c => c.MapFrom(t => t.TrialFileRecord.FileName));
             CreateMap<TrialTrianingRecord, TrialTrianingRecordAddOrEdit>().ReverseMap();
 
 
-
+            CreateMap<TrialHistoryRecordFile, TrialHistoryRecordFileView>();
+            CreateMap<TrialHistoryRecordFile, TrialHistoryRecordFileAddOrEdit>().ReverseMap();
         }
     }