admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Corrected the spell correct in get payment request filter

Browse Source
This commit is contained in:
ashutosh.nehete 2025-11-04 09:49:28 +05:30
parent 18480b94cd
commit 61674d69da
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marco.Pms.Model/ViewModels/Expenses/AdvancePaymentTransactionVM.cs
View File

@ -1,18 +1,14 @@
using Marco.Pms.Model.ViewModels.Activities; using Marco.Pms.Model.ViewModels.Activities;
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Marco.Pms.Model.ViewModels.Projects;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Marco.Pms.Model.ViewModels.Expenses namespace Marco.Pms.Model.ViewModels.Expenses
{ {
public class AdvancePaymentTransactionVM public class AdvancePaymentTransactionVM
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
public string FinanceUId { get; set; } = default!; public string? FinanceUId { get; set; }
public string? Title { get; set; }
public BasicProjectVM? Project { get; set; }
public BasicEmployeeVM? Employee { get; set; } public BasicEmployeeVM? Employee { get; set; }
public double Amount { get; set; } public double Amount { get; set; }
public DateTime CreatedAt { get; set; } public DateTime CreatedAt { get; set; }

13
Marco.Pms.Services/Service/ExpensesService.cs
View File

@ -1566,7 +1566,7 @@ namespace Marco.Pms.Services.Service
Currency = paymentRequests.Where(pr => pr.Currency != null).Select(pr => new { Id = pr.Currency!.Id, Name = pr.Currency.CurrencyName }).Distinct().ToList(), Currency = paymentRequests.Where(pr => pr.Currency != null).Select(pr => new { Id = pr.Currency!.Id, Name = pr.Currency.CurrencyName }).Distinct().ToList(),
CreatedBy = paymentRequests.Where(pr => pr.CreatedBy != null).Select(pr => new { Id = pr.CreatedBy!.Id, Name = $"{pr.CreatedBy.FirstName} {pr.CreatedBy.LastName}" }).Distinct().ToList(), CreatedBy = paymentRequests.Where(pr => pr.CreatedBy != null).Select(pr => new { Id = pr.CreatedBy!.Id, Name = $"{pr.CreatedBy.FirstName} {pr.CreatedBy.LastName}" }).Distinct().ToList(),
Status = paymentRequests.Where(pr => pr.ExpenseStatus != null).Select(pr => new { Id = pr.ExpenseStatus!.Id, Name = pr.ExpenseStatus.Name }).Distinct().ToList(), Status = paymentRequests.Where(pr => pr.ExpenseStatus != null).Select(pr => new { Id = pr.ExpenseStatus!.Id, Name = pr.ExpenseStatus.Name }).Distinct().ToList(),
ExpensesCategory = paymentRequests.Where(pr => pr.ExpenseCategory != null).Select(pr => new { Id = pr.ExpenseCategory!.Id, Name = pr.ExpenseCategory.Name }).Distinct().ToList(), ExpenseCategory = paymentRequests.Where(pr => pr.ExpenseCategory != null).Select(pr => new { Id = pr.ExpenseCategory!.Id, Name = pr.ExpenseCategory.Name }).Distinct().ToList(),
Payees = paymentRequests.Where(pr => !string.IsNullOrWhiteSpace(pr.Payee)).Select(pr => new { Id = pr.Payee, Name = pr.Payee }).Distinct().ToList() Payees = paymentRequests.Where(pr => !string.IsNullOrWhiteSpace(pr.Payee)).Select(pr => new { Id = pr.Payee, Name = pr.Payee }).Distinct().ToList()
}; };
return ApiResponse<object>.SuccessResponse(response, "Successfully fetched the filter list", 200); return ApiResponse<object>.SuccessResponse(response, "Successfully fetched the filter list", 200);
@ -2102,10 +2102,13 @@ namespace Marco.Pms.Services.Service
try try
{ {
var transactions = await _context.AdvancePaymentTransactions var transactions = await _context.AdvancePaymentTransactions
.Include(t => t.Employee) .Include(apt => apt.Project)
.Include(t => t.CreatedBy) .Include(apt => apt.Employee)
.Where(t => t.EmployeeId == employeeId && t.IsActive) .ThenInclude(e => e!.JobRole)
.OrderByDescending(t => t.CreatedAt) .Include(apt => apt.CreatedBy)
.ThenInclude(e => e!.JobRole)
.Where(apt => apt.EmployeeId == employeeId && apt.IsActive)
.OrderByDescending(apt => apt.CreatedAt)
.ToListAsync(); .ToListAsync();
if (transactions == null || !transactions.Any()) if (transactions == null || !transactions.Any())