diff --git a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs index bb391aa1a..5b4a9ccf8 100644 --- a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs @@ -28,7 +28,6 @@ namespace IRaCIS.Core.Application.Service public async Task> GetCommonDocumentList(CommonDocumentQuery queryCommonDocument) { - var commonDocumentQueryable = _commonDocumentRepository.ProjectTo(_mapper.ConfigurationProvider); return await commonDocumentQueryable.ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs index b5bed4ba8..64607e7e4 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs @@ -12,8 +12,8 @@ namespace IRaCIS.Core.Application.ViewModel public class CommonDocumentView : CommonDocumentAddOrEdit { - //public string FileType { get; set; } = String.Empty; - //public string ModuleType { get; set; } = String.Empty; + public string FileType { get; set; } = String.Empty; + public string ModuleType { get; set; } = String.Empty; public DateTime? DeletedTime { get; set; } diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index 3895cd7f5..e4b5dccf4 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -43,7 +43,9 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); - CreateMap(); + CreateMap() + .ForMember(o => o.FileType, t => t.MapFrom(u => u.FileType.Value)) + .ForMember(o => o.ModuleType, t => t.MapFrom(u => u.ModuleType.Value)); CreateMap().ReverseMap(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index c4c4dfa6f..7e6744563 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -54,17 +54,23 @@ namespace IRaCIS.Application.Contracts public UserTypeEnum UserTypeEnum { get; set; } - public string OrganizationName { get; set; } = String.Empty; public string UserRealName { get; set; } = String.Empty; public string UserName { get; set; } = String.Empty; - - } + + public class TrialUserExportDTO + { + public TrialSelectDTO TrialInfo { get; set; } + + public List TrialUserList { get; set; } = new List(); + } + + public class SiteCRCCommand : UserTrialCommand { public Guid SiteId { get; set; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 685718b34..db159f129 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -5,6 +5,9 @@ using IRaCIS.Core.Domain.Share; using Microsoft.AspNetCore.Mvc; using IRaCIS.Core.Application.Contracts.DTO; using IRaCIS.Application.Interfaces; +using Magicodes.ExporterAndImporter.Core; +using Magicodes.ExporterAndImporter.Excel; +using Magicodes.ExporterAndImporter.Excel.AspNetCore; namespace IRaCIS.Application.Services { @@ -12,10 +15,12 @@ namespace IRaCIS.Application.Services public class TrialMaintenanceService : BaseService, ITrialMaintenanceService { private readonly IRepository _trialUseRepository; + private readonly IRepository _trialRepository; - public TrialMaintenanceService(IRepository trialUseRepository) + public TrialMaintenanceService(IRepository trialUseRepository,IRepository trialRepository) { _trialUseRepository = trialUseRepository; + _trialRepository = trialRepository; } /// @@ -41,6 +46,25 @@ namespace IRaCIS.Application.Services } + [HttpGet] + public async Task TrialUserListExport(Guid trialId) + { + var list = _trialUseRepository.Where(t => t.TrialId == trialId).IgnoreQueryFilters() + .ProjectTo(_mapper.ConfigurationProvider).ToList(); + + + //var trialInfo= _re + + IExporter exporter = new ExcelExporter(); + + var result = await exporter.ExportAsByteArray(list); + + + return new XlsxFileResult(bytes: result, fileDownloadName: $"检查导出_{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx"); + + + } + diff --git a/IRaCIS.Core.Domain/Common/CommonDocument.cs b/IRaCIS.Core.Domain/Common/CommonDocument.cs index 64c3df1cb..2f252ff1c 100644 --- a/IRaCIS.Core.Domain/Common/CommonDocument.cs +++ b/IRaCIS.Core.Domain/Common/CommonDocument.cs @@ -85,7 +85,12 @@ namespace IRaCIS.Core.Domain.Models /// [Required] public Guid ModuleId { get; set; } - - } + + + public Dictionary FileType { get; set; } + + public Dictionary ModuleType { get; set; } + + } }