模块类型

Uat_Study
hang 2022-04-01 14:35:38 +08:00
parent 8a7cdc6313
commit 3f1b3f02ec
6 changed files with 46 additions and 10 deletions

View File

@ -28,7 +28,6 @@ namespace IRaCIS.Core.Application.Service
public async Task<List<CommonDocumentView>> GetCommonDocumentList(CommonDocumentQuery queryCommonDocument)
{
var commonDocumentQueryable = _commonDocumentRepository.ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider);
return await commonDocumentQueryable.ToListAsync();

View File

@ -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; }

View File

@ -43,7 +43,9 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
CreateMap<CommonDocument, CommonDocumentView>();
CreateMap<CommonDocument, CommonDocumentView>()
.ForMember(o => o.FileType, t => t.MapFrom(u => u.FileType.Value))
.ForMember(o => o.ModuleType, t => t.MapFrom(u => u.ModuleType.Value));
CreateMap<CommonDocument, CommonDocumentAddOrEdit>().ReverseMap();

View File

@ -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<TrialMaintenanceDTO> TrialUserList { get; set; } = new List<TrialMaintenanceDTO>();
}
public class SiteCRCCommand : UserTrialCommand
{
public Guid SiteId { get; set; }

View File

@ -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<TrialUser> _trialUseRepository;
private readonly IRepository<Trial> _trialRepository;
public TrialMaintenanceService(IRepository<TrialUser> trialUseRepository)
public TrialMaintenanceService(IRepository<TrialUser> trialUseRepository,IRepository<Trial> trialRepository)
{
_trialUseRepository = trialUseRepository;
_trialRepository = trialRepository;
}
/// <summary>
@ -41,6 +46,25 @@ namespace IRaCIS.Application.Services
}
[HttpGet]
public async Task<IActionResult> TrialUserListExport(Guid trialId)
{
var list = _trialUseRepository.Where(t => t.TrialId == trialId).IgnoreQueryFilters()
.ProjectTo<TrialMaintenanceDTO>(_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");
}

View File

@ -85,7 +85,12 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
[Required]
public Guid ModuleId { get; set; }
}
public Dictionary FileType { get; set; }
public Dictionary ModuleType { get; set; }
}
}