Commit 91ebb9c8 by lcx

no message

parent 9b5db502
...@@ -22,6 +22,7 @@ public class ExtractService : IAutoInjection ...@@ -22,6 +22,7 @@ public class ExtractService : IAutoInjection
private readonly PerforHospitalRepository hospitalRepository; private readonly PerforHospitalRepository hospitalRepository;
private readonly PerforPerallotRepository perallotRepository; private readonly PerforPerallotRepository perallotRepository;
private readonly PerforcollectdataRepository collectdataRepository; private readonly PerforcollectdataRepository collectdataRepository;
private readonly PerforPeremployeeRepository peremployeeRepository;
public ExtractService( public ExtractService(
ILogger<ExtractService> logger, ILogger<ExtractService> logger,
...@@ -31,7 +32,8 @@ public class ExtractService : IAutoInjection ...@@ -31,7 +32,8 @@ public class ExtractService : IAutoInjection
PerSheetService perSheetService, PerSheetService perSheetService,
PerforHospitalRepository hospitalRepository, PerforHospitalRepository hospitalRepository,
PerforPerallotRepository perallotRepository, PerforPerallotRepository perallotRepository,
PerforcollectdataRepository collectdataRepository PerforcollectdataRepository collectdataRepository,
PerforPeremployeeRepository peremployeeRepository
) )
{ {
this.logger = logger; this.logger = logger;
...@@ -42,6 +44,7 @@ PerforcollectdataRepository collectdataRepository ...@@ -42,6 +44,7 @@ PerforcollectdataRepository collectdataRepository
this.hospitalRepository = hospitalRepository; this.hospitalRepository = hospitalRepository;
this.perallotRepository = perallotRepository; this.perallotRepository = perallotRepository;
this.collectdataRepository = collectdataRepository; this.collectdataRepository = collectdataRepository;
this.peremployeeRepository = peremployeeRepository;
} }
/// <summary> /// <summary>
...@@ -75,7 +78,7 @@ public string Main(int allotId, int hospitalId, string email, string groupName = ...@@ -75,7 +78,7 @@ public string Main(int allotId, int hospitalId, string email, string groupName =
var templateFilePath = ExtractHelper.GetExtractFile(hospitalId, ref extractFilePath, filePath); var templateFilePath = ExtractHelper.GetExtractFile(hospitalId, ref extractFilePath, filePath);
WriteDataToFile(templateFilePath, extractFilePath, dict, standData); WriteDataToFile(templateFilePath, extractFilePath, allotId, dict, standData);
return templateFilePath; return templateFilePath;
} }
...@@ -91,7 +94,7 @@ public string Main(int allotId, int hospitalId, string email, string groupName = ...@@ -91,7 +94,7 @@ public string Main(int allotId, int hospitalId, string email, string groupName =
return extractFilePath; return extractFilePath;
} }
private void WriteDataToFile(string templateFile, string extractFile, Dictionary<ExDataDict, object> exdict, List<ExtractTransDto> extractDto) private void WriteDataToFile(string templateFile, string extractFile, int allotId, Dictionary<ExDataDict, object> exdict, List<ExtractTransDto> extractDto)
{ {
if (!FileHelper.IsExistFile(templateFile)) if (!FileHelper.IsExistFile(templateFile))
throw new PerformanceException(""); throw new PerformanceException("");
...@@ -117,7 +120,8 @@ private void WriteDataToFile(string templateFile, string extractFile, Dictionary ...@@ -117,7 +120,8 @@ private void WriteDataToFile(string templateFile, string extractFile, Dictionary
if (customer != null) if (customer != null)
{ {
var data = extractDto.Where(t => t.SheetName.NoBlank() == sheet.SheetName.NoBlank())?.ToList(); var exdata = extractDto.Where(t => t.SheetName.NoBlank() == sheet.SheetName.NoBlank())?.ToList();
var data = GetDataBySheetType(allotId, sheetType, exdata);
customer.WriteSheetData(sheet, point, sheetType, style, data, exdict); customer.WriteSheetData(sheet, point, sheetType, style, data, exdict);
} }
} }
...@@ -128,6 +132,19 @@ private void WriteDataToFile(string templateFile, string extractFile, Dictionary ...@@ -128,6 +132,19 @@ private void WriteDataToFile(string templateFile, string extractFile, Dictionary
} }
} }
private object GetDataBySheetType(int allotId, SheetType sheetType, List<ExtractTransDto> extractDto)
{
switch (sheetType)
{
case SheetType.Employee:
case SheetType.ClinicEmployee:
case SheetType.AccountBasic:
return peremployeeRepository.GetEntities(t => t.AllotId == allotId);
default:
return extractDto;
}
}
/// <summary> /// <summary>
/// 标准数据格式, 匹配科室字典 /// 标准数据格式, 匹配科室字典
/// </summary> /// </summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment