Compare commits
1 Commits
main
...
Project_Re
| Author | SHA1 | Date | |
|---|---|---|---|
| a12e74ad00 |
@ -133,13 +133,13 @@ namespace Marco.Pms.Services.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet("get/project/report/{projectId}")]
|
[HttpGet("get/project/report/{projectId}")]
|
||||||
public async Task<IActionResult> GetProjectReport(Guid projectId)
|
public async Task<IActionResult> GetProjectReport(Guid projectId, [FromQuery] DateTime? date)
|
||||||
{
|
{
|
||||||
using var scope = _serviceScopeFactory.CreateScope();
|
using var scope = _serviceScopeFactory.CreateScope();
|
||||||
var _reportHelper = scope.ServiceProvider.GetRequiredService<ReportHelper>();
|
var _reportHelper = scope.ServiceProvider.GetRequiredService<ReportHelper>();
|
||||||
var _logger = scope.ServiceProvider.GetRequiredService<ILoggingService>();
|
var _logger = scope.ServiceProvider.GetRequiredService<ILoggingService>();
|
||||||
|
|
||||||
var resonse = await _reportHelper.GetDailyProjectReportWithOutTenant(projectId);
|
var resonse = await _reportHelper.GetDailyProjectReportWithOutTenant(projectId, date);
|
||||||
|
|
||||||
if (resonse == null)
|
if (resonse == null)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -25,10 +25,18 @@ namespace Marco.Pms.Services.Helpers
|
|||||||
_cache = cache;
|
_cache = cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<ProjectStatisticReport?> GetDailyProjectReportWithOutTenant(Guid projectId)
|
public async Task<ProjectStatisticReport?> GetDailyProjectReportWithOutTenant(Guid projectId, DateTime? date = null)
|
||||||
{
|
{
|
||||||
// await _cache.GetBuildingAndFloorByWorkAreaId();
|
// 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);
|
var project = await _cache.GetProjectDetailsWithBuildings(projectId);
|
||||||
if (project == null)
|
if (project == null)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user