Commit 86496975f1c5d1de1105392e406c4f269b9c39ad
Exists in
master
Merge branch 'ieducativa-correcao-nome-dos-pais-atestado-de-frequencia'
Showing
2 changed files
with
14 additions
and
14 deletions
Show diff stats
ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jrxml
@@ -46,8 +46,10 @@ | @@ -46,8 +46,10 @@ | ||
46 | mt.ultima_matricula = 1) as dt_matricula, | 46 | mt.ultima_matricula = 1) as dt_matricula, |
47 | matricula.ano as matricula_ano, | 47 | matricula.ano as matricula_ano, |
48 | fcn_upper(instituicao.cidade) as cidade, | 48 | fcn_upper(instituicao.cidade) as cidade, |
49 | - fcn_upper(aluno.nm_pai) as nm_pai, | ||
50 | - fcn_upper(aluno.nm_mae) as nm_mae, | 49 | + |
50 | + (SELECT CASE WHEN fisica.idpes_pai IS NOT NULL THEN (SELECT upper(pessoa.nome) FROM cadastro.pessoa WHERE pessoa.idpes = fisica.idpes_pai LIMIT 1) WHEN fisica.nome_pai IS NOT NULL AND TRIM(fisica.nome_pai) != '' THEN fisica.nome_pai WHEN aluno.nm_pai IS NOT NULL AND aluno.nm_pai != TRIM('') THEN upper(aluno.nm_pai) ELSE 'Não informado' END) AS nm_pai, | ||
51 | + | ||
52 | + (SELECT CASE WHEN fisica.idpes_mae IS NOT NULL THEN (SELECT upper(pessoa.nome) FROM cadastro.pessoa WHERE pessoa.idpes = fisica.idpes_mae LIMIT 1) WHEN fisica.nome_mae IS NOT NULL AND TRIM(fisica.nome_mae) != '' THEN fisica.nome_mae WHEN aluno.nm_mae IS NOT NULL AND aluno.nm_mae != TRIM('') THEN upper(aluno.nm_mae) ELSE 'Não informado' END) AS nm_mae, | ||
51 | 53 | ||
52 | (SELECT COALESCE((SELECT COALESCE (fcn_upper(ps.nome),fcn_upper(juridica.fantasia)) | 54 | (SELECT COALESCE((SELECT COALESCE (fcn_upper(ps.nome),fcn_upper(juridica.fantasia)) |
53 | FROM cadastro.pessoa ps, | 55 | FROM cadastro.pessoa ps, |
ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jrxml
@@ -252,9 +252,7 @@ FROM pmieducar.aluno, | @@ -252,9 +252,7 @@ FROM pmieducar.aluno, | ||
252 | fisica.idpes = aluno.ref_idpes AND | 252 | fisica.idpes = aluno.ref_idpes AND |
253 | aluno.cod_aluno = $P{aluno}) as data_nasc, | 253 | aluno.cod_aluno = $P{aluno}) as data_nasc, |
254 | 254 | ||
255 | -(SELECT public.fcn_upper(COALESCE(aluno.nm_pai,'NAO INFORMADO')) || ' e ' || public.fcn_upper(COALESCE(aluno.nm_mae,'NAO INFORMADO')) | ||
256 | -FROM pmieducar.aluno | ||
257 | - WHERE aluno.cod_aluno = $P{aluno}) as nome_dos_pais | 255 | +(SELECT public.fcn_upper(COALESCE((SELECT pessoa_pai.nome FROM cadastro.fisica AS pessoa_aluno, cadastro.pessoa AS pessoa_pai WHERE pessoa_aluno.idpes = ref_idpes AND pessoa_pai.idpes = pessoa_aluno.idpes_pai), aluno.nm_pai, 'NAO INFORMADO')) || ' e ' || public.fcn_upper(COALESCE((SELECT pessoa_mae.nome FROM cadastro.fisica AS pessoa_aluno, cadastro.pessoa AS pessoa_mae WHERE pessoa_aluno.idpes = ref_idpes AND pessoa_mae.idpes = pessoa_aluno.idpes_mae), aluno.nm_mae, 'NAO INFORMADO') ) FROM pmieducar.aluno WHERE aluno.cod_aluno = $P{aluno}) AS nome_dos_pais |
258 | 256 | ||
259 | FROM ( | 257 | FROM ( |
260 | SELECT nm_disciplina, | 258 | SELECT nm_disciplina, |
@@ -1187,15 +1185,15 @@ ORDER BY 1 ASC]]> | @@ -1187,15 +1185,15 @@ ORDER BY 1 ASC]]> | ||
1187 | <field name="obs7" class="java.lang.String"/> | 1185 | <field name="obs7" class="java.lang.String"/> |
1188 | <field name="obs8" class="java.lang.String"/> | 1186 | <field name="obs8" class="java.lang.String"/> |
1189 | <field name="obs9" class="java.lang.String"/> | 1187 | <field name="obs9" class="java.lang.String"/> |
1190 | - <field name="freq1" class="java.lang.Double"/> | ||
1191 | - <field name="freq2" class="java.lang.Double"/> | ||
1192 | - <field name="freq3" class="java.lang.Double"/> | ||
1193 | - <field name="freq4" class="java.lang.Double"/> | ||
1194 | - <field name="freq5" class="java.lang.Double"/> | ||
1195 | - <field name="freq6" class="java.lang.Double"/> | ||
1196 | - <field name="freq7" class="java.lang.Double"/> | ||
1197 | - <field name="freq8" class="java.lang.Double"/> | ||
1198 | - <field name="freq9" class="java.lang.Double"/> | 1188 | + <field name="freq1" class="java.math.BigDecimal"/> |
1189 | + <field name="freq2" class="java.math.BigDecimal"/> | ||
1190 | + <field name="freq3" class="java.math.BigDecimal"/> | ||
1191 | + <field name="freq4" class="java.math.BigDecimal"/> | ||
1192 | + <field name="freq5" class="java.math.BigDecimal"/> | ||
1193 | + <field name="freq6" class="java.math.BigDecimal"/> | ||
1194 | + <field name="freq7" class="java.math.BigDecimal"/> | ||
1195 | + <field name="freq8" class="java.math.BigDecimal"/> | ||
1196 | + <field name="freq9" class="java.math.BigDecimal"/> | ||
1199 | <field name="status_serie1" class="java.lang.String"/> | 1197 | <field name="status_serie1" class="java.lang.String"/> |
1200 | <field name="status_serie2" class="java.lang.String"/> | 1198 | <field name="status_serie2" class="java.lang.String"/> |
1201 | <field name="status_serie3" class="java.lang.String"/> | 1199 | <field name="status_serie3" class="java.lang.String"/> |