diff --git a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java index 08744b6..5dbedff 100644 --- a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java +++ b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java @@ -22,10 +22,9 @@ public class BeanRequisicaoSubReport { this.unidadeReq = (String) objArray[2]; this.enderecoUR = (String) objArray[3]; this.requisitante = (String) objArray[4]; - this.atendidaPor = (String) objArray[5]; - this.centroCustos = (String) objArray[6]; - this.cadEm = UtilDate.formatarData(objArray[7]); - this.atendidaEm = UtilDate.formatarData(objArray[8]); + this.centroCustos = (String) objArray[5]; + this.cadEm = UtilDate.formatarData(objArray[6]); + this.atendidaEm = UtilDate.formatarData(objArray[7]); } public String getNumeroRequisicao() { diff --git a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java index f698140..e7561fa 100644 --- a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java +++ b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java @@ -254,19 +254,15 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro private Object[] getRequisicao(Long requisicaoId){ StringBuilder sql = new StringBuilder(); - sql.append("select req_c.numerorequisicao as numerorequisicao,alm.nome as almoxarifado,requisitante.nome as unidadereq,locale.nome as enderecour,pessoa_req.nome as requisitante,"); - sql.append("usuario.username as atendidapor,c_custo.descricao as centrocustos,req_c.datacriacao as cadem,req_c.datafinalizacaoatendimento as atendidaem from alm_requisicaoconsumo req_c"); + sql.append("select req_c.numerorequisicao as numerorequisicao,alm.nome as almoxarifado,requisitante.nome as unidadereq,locale.nome as enderecour,"); + sql.append(" usuario.nome as atendidapor,c_custo.descricao as centrocustos,req_c.datacriacao as cadem,req_c.datafinalizacaoatendimento as atendidaem from alm_requisicaoconsumo req_c"); sql.append(" left join estruturaorganizacional alm on req_c.almoxarifado_id = alm.id"); sql.append(" left join estruturaorganizacional requisitante on req_c.unidadeRequisitante_id = requisitante.id"); sql.append(" left join localizacao locale on requisitante.localizacao_id = locale.id"); sql.append(" left join centrocusto c_custo on req_c.centrocusto_id = c_custo.id"); sql.append(" left join seguranca_usuario usuario on req_c.autor_id = usuario.id"); - sql.append(" left join pessoa pessoa_req on pessoa_req.usuario_id = usuario.id"); sql.append(" where req_c.id = ").append(requisicaoId); - return executSQL(sql); - } - - private Object[] executSQL(StringBuilder sql) { - return (Object[]) usuarioService.singleResultNativeQuery(sql.toString()); + + return (Object[])usuarioService.singleResultNativeQuery(sql.toString()); } } \ No newline at end of file -- libgit2 0.21.2