From 6712176496ebf80503c25e90df94cd0727b785f4 Mon Sep 17 00:00:00 2001 From: Felix Morales Date: Wed, 10 Apr 2024 14:30:13 -0500 Subject: [PATCH] Se agrega la propiedad IdCorresponsal a los tabuladores para hacer la distincion cuando es un tabulador de cliente y cuando es de corresponsal --- Contracts/Catalogos/ITabuladorRepository.cs | 2 +- Controllers/Catalogos/TabuladorController.cs | 6 +++--- DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs | 2 ++ Models/Catalogos/Tabulador.cs | 1 + Repository/Catalogos/TabuladorRepository.cs | 6 ++++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Contracts/Catalogos/ITabuladorRepository.cs b/Contracts/Catalogos/ITabuladorRepository.cs index 301769b..fe7dd62 100644 --- a/Contracts/Catalogos/ITabuladorRepository.cs +++ b/Contracts/Catalogos/ITabuladorRepository.cs @@ -3,7 +3,7 @@ namespace CORRESPONSALBackend.Contracts.Catalogos { public interface ITabuladorRepository { - public Task> GetAll(int id, int IdCliente); + public Task> GetAll(int id, int IdCliente, int? idCorresponsal); public Task Append(Tabulador data); public Task Delete(int id); } diff --git a/Controllers/Catalogos/TabuladorController.cs b/Controllers/Catalogos/TabuladorController.cs index 72d70f6..c5f9bdc 100644 --- a/Controllers/Catalogos/TabuladorController.cs +++ b/Controllers/Catalogos/TabuladorController.cs @@ -22,16 +22,16 @@ namespace CORRESPONSALBackend.Controllers.Catalogos [HttpGet] [Route("getAll")] - public async Task> GetAll(int id, int IdCliente) + public async Task> GetAll(int id, int IdCliente, int? idCorresponsal) { - return await _Repo.GetAll(id, IdCliente); + return await _Repo.GetAll(id, IdCliente, idCorresponsal); } [HttpGet] [Route("getByCustomer")] public async Task> GetByCustomer(int IdCliente) { - return await _Repo.GetAll(0, IdCliente); + return await _Repo.GetAll(0, IdCliente, 0); } diff --git a/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs b/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs index 7107ae9..ef9ca25 100644 --- a/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs +++ b/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs @@ -19,5 +19,7 @@ namespace CORRESPONSALBackend.DTO.Reportes.CuentasCerradas{ public string ValorComercial { get; set; } public string Fracciones { get; set; } public string Caja { get; set; } + public string FechaCruce {get;set;} + public string Semaforo {get;set;} } } \ No newline at end of file diff --git a/Models/Catalogos/Tabulador.cs b/Models/Catalogos/Tabulador.cs index a1a53a3..f17210b 100644 --- a/Models/Catalogos/Tabulador.cs +++ b/Models/Catalogos/Tabulador.cs @@ -6,5 +6,6 @@ public string Nombre { set; get; } = null!; public int IdCliente { set; get; } = 0; public Boolean Activo { set; get; } = true; + public int? IdCorresponsal {get;set;} = null; } } diff --git a/Repository/Catalogos/TabuladorRepository.cs b/Repository/Catalogos/TabuladorRepository.cs index c214709..d962a2d 100644 --- a/Repository/Catalogos/TabuladorRepository.cs +++ b/Repository/Catalogos/TabuladorRepository.cs @@ -12,14 +12,15 @@ namespace CORRESPONSALBackend.Repository.Catalogos private readonly DapperContext _context; public TabuladorRepository(DapperContext context) { _context = context; } - public async Task> GetAll(int id, int IdCliente) + public async Task> GetAll(int id, int IdCliente, int? idCorresponsal) { var query = "[Catalogo.Tabulador.Get]"; using var connection = _context.CreateConnection(); var entrada = await connection.QueryAsync(query, new { @id = id, - @IdCliente = IdCliente + @IdCliente = IdCliente, + @IdCorresponsal = idCorresponsal }, commandType: CommandType.StoredProcedure); return entrada; @@ -35,6 +36,7 @@ namespace CORRESPONSALBackend.Repository.Catalogos data.id, data.Nombre, data.IdCliente, + data.IdCorresponsal }, commandType: CommandType.StoredProcedure); return entrada.First();