diff --git a/Marco.Pms.Services/Controllers/MarketController.cs b/Marco.Pms.Services/Controllers/MarketController.cs index 484039a..77d5ff9 100644 --- a/Marco.Pms.Services/Controllers/MarketController.cs +++ b/Marco.Pms.Services/Controllers/MarketController.cs @@ -133,13 +133,13 @@ namespace Marco.Pms.Services.Controllers } [HttpGet("get/project/report/{projectId}")] - public async Task GetProjectReport(Guid projectId) + public async Task GetProjectReport(Guid projectId, [FromQuery] DateTime? date) { using var scope = _serviceScopeFactory.CreateScope(); var _reportHelper = scope.ServiceProvider.GetRequiredService(); var _logger = scope.ServiceProvider.GetRequiredService(); - var resonse = await _reportHelper.GetDailyProjectReportWithOutTenant(projectId); + var resonse = await _reportHelper.GetDailyProjectReportWithOutTenant(projectId, date); if (resonse == null) { diff --git a/Marco.Pms.Services/Helpers/ReportHelper.cs b/Marco.Pms.Services/Helpers/ReportHelper.cs index 573c8b8..bd037e8 100644 --- a/Marco.Pms.Services/Helpers/ReportHelper.cs +++ b/Marco.Pms.Services/Helpers/ReportHelper.cs @@ -25,10 +25,18 @@ namespace Marco.Pms.Services.Helpers _cache = cache; } - public async Task GetDailyProjectReportWithOutTenant(Guid projectId) + public async Task GetDailyProjectReportWithOutTenant(Guid projectId, DateTime? date = null) { // await _cache.GetBuildingAndFloorByWorkAreaId(); - DateTime reportDate = DateTime.UtcNow.AddDays(-1).Date; + DateTime reportDate; + if (date.HasValue) + { + reportDate = date.Value; + } + else + { + reportDate = DateTime.UtcNow.AddDays(-1).Date; + } var project = await _cache.GetProjectDetailsWithBuildings(projectId); if (project == null) {