Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

# Conflicts:
#	ReportImp/AkggMid/CustomReportCreator.cs
This commit is contained in:
Christian
2023-09-19 00:34:11 +02:00
81 changed files with 87862 additions and 138249 deletions

View File

@@ -351,7 +351,8 @@ namespace ReportingService.ServiceImplementations
public MemoryStream CreatePersonListReport(List<long> oids)
{
return null;
var reportCreator = GetReportCreator();
return CreateReportStream(reportCreator.CreatePersonListReport(oids));
}
public MemoryStream CreateEmployeeListReport(List<long> oids)
@@ -374,9 +375,10 @@ namespace ReportingService.ServiceImplementations
return null;
}
public MemoryStream CreateUSerGroupListReport(List<long> oids)
public MemoryStream CreateUserGroupListReport(List<long> oids)
{
return null;
var reportCreator = GetReportCreator();
return CreateReportStream(reportCreator.CreateUserGroupListReport(oids));
}
}
}