diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js index 05288f19ce7ef229ef479402a9d12f492047366a..3401b1d11f62e0b8daa440053d0f099d41628048 100644 --- a/src/libs/routes/school.js +++ b/src/libs/routes/school.js @@ -488,18 +488,18 @@ rqfCount.addField({ field: 'local_func_predio_escolar' } }).addValue({ - name: 'library_and_reading_room', + name: 'library_or_reading_room', table: 'escola', tableField: ['biblioteca', 'sala_leitura', 'biblioteca_sala_leitura'], - resultField: 'library_and_reading_room', + resultField: 'library_or_reading_room', where: { relation: '=', type: 'boolean', condition: 'or', - field: 'local_func_predio_escolar' + field: ['biblioteca', 'sala_leitura', 'biblioteca_sala_leitura'] } }); - +// SELECT COUNT(escola.id) AS "total", 'Brasil' AS "name", escola.ano_censo AS "year" FROM escola WHERE (escola.biblioteca = ? OR escola.sala_leitura = ? OR escola.biblioteca_sala_leitura) AND (escola.situacao_de_funcionamento = 1 AND escola.ensino_regular = 1) GROUP BY escola.ano_censo ORDER BY escola.ano_censo ASC schoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { console.log(req.filter); if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0) {