diff --git a/src/libs/routes/class.js b/src/libs/routes/class.js index cf8afac0490230065fccc765703d4b6c5a14c950..80e12a1c13586d0d392a4114251e761c43dce752 100644 --- a/src/libs/routes/class.js +++ b/src/libs/routes/class.js @@ -368,6 +368,16 @@ rqfCount.addField({ foreign: ['escola_id', 'ano_censo'], foreignTable: 'turma' } +}, 'filter').addValueToField({ + name: 'period_not', + table: 'turma', + tableField: 'turma_turno_id', + resultField: 'period_id', + where: { + relation: '<>', + type: 'integer', + field: 'turma_turno_id' + } }, 'filter'); diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js index 3d2f32d31c4eba7c75541261290023fc8d2e56ab..f9fd713777255243f731b89b9751b308eb279c3a 100644 --- a/src/libs/routes/enrollment.js +++ b/src/libs/routes/enrollment.js @@ -594,7 +594,7 @@ rqf.addField({ type: 'boolean', field: 'exclusiva_especial' } -}).addValue({ +}).addValueToField({ name: 'period_not', table: 'matricula', tableField: 'turma_turno_id', @@ -604,7 +604,7 @@ rqf.addField({ type: 'integer', field: 'turma_turno_id' } -}); +}, 'filter'); enrollmentApp.get('/', rqf.parse(), (req, res, next) => { req.sql.field('COUNT(*)', 'total')