diff --git a/.DS_Store b/.DS_Store index 10f972f..d63f054 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/server/controller/Servicio/gustavoBazPrada.js b/server/controller/Servicio/gustavoBazPrada.js index 201b4e5..2a243ee 100644 --- a/server/controller/Servicio/gustavoBazPrada.js +++ b/server/controller/Servicio/gustavoBazPrada.js @@ -14,8 +14,10 @@ const gustavoBazPrada = async (body) => { return Servicio.findAll({ where: { - fechaLiberacion: { [Op.gte]: moment(`${year}-01-31`) }, - fechaLiberacion: { [Op.lte]: moment(`${year + 1}-01-31`) }, + [Op.and]: { + fechaLiberacion: { [Op.gte]: moment(`${year}-01-31`) }, + fechaLiberacion: { [Op.lte]: moment(`${year + 1}-01-31`) }, + }, }, include: [{ model: Usuario }, { model: Carrera }], }).then((res) => { diff --git a/server/controller/Servicio/reporte.js b/server/controller/Servicio/reporte.js index c5e746c..5b7f1fc 100644 --- a/server/controller/Servicio/reporte.js +++ b/server/controller/Servicio/reporte.js @@ -15,8 +15,10 @@ const reporte = async (body) => { return Servicio.findAll({ where: { - fechaInicio: { [Op.gte]: inicio }, - fechaInicio: { [Op.lte]: fin }, + [Op.and]: { + fechaInicio: { [Op.gte]: inicio }, + fechaInicio: { [Op.lte]: fin }, + }, }, include: [{ model: Programa }, { model: Usuario }, { model: Carrera }], }).then((res) => {