Download as
Browse Code »

Commit 7a41928f7c53100d9a576feb93e320433a644eeb

Authored by joyfas.silva
1 parent 3a88e821
Exists in master

Redmine #tarefa-4936

Showing 2 changed files with 7 additions and 12 deletions   Show diff stats
cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java
  Diff comments   View file @7a41928
@@ -22,10 +22,9 @@ public class BeanRequisicaoSubReport { @@ -22,10 +22,9 @@ public class BeanRequisicaoSubReport {
22 this.unidadeReq = (String) objArray[2]; 22 this.unidadeReq = (String) objArray[2];
23 this.enderecoUR = (String) objArray[3]; 23 this.enderecoUR = (String) objArray[3];
24 this.requisitante = (String) objArray[4]; 24 this.requisitante = (String) objArray[4];
25 - this.atendidaPor = (String) objArray[5];  
26 - this.centroCustos = (String) objArray[6];  
27 - this.cadEm = UtilDate.formatarData(objArray[7]);  
28 - this.atendidaEm = UtilDate.formatarData(objArray[8]); 25 + this.centroCustos = (String) objArray[5];
  26 + this.cadEm = UtilDate.formatarData(objArray[6]);
  27 + this.atendidaEm = UtilDate.formatarData(objArray[7]);
29 } 28 }
30 29
31 public String getNumeroRequisicao() { 30 public String getNumeroRequisicao() {
cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java
  Diff comments   View file @7a41928
@@ -254,19 +254,15 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro @@ -254,19 +254,15 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro
254 254
255 private Object[] getRequisicao(Long requisicaoId){ 255 private Object[] getRequisicao(Long requisicaoId){
256 StringBuilder sql = new StringBuilder(); 256 StringBuilder sql = new StringBuilder();
257 - 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,");  
258 - 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"); 257 + sql.append("select req_c.numerorequisicao as numerorequisicao,alm.nome as almoxarifado,requisitante.nome as unidadereq,locale.nome as enderecour,");
  258 + 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");
259 sql.append(" left join estruturaorganizacional alm on req_c.almoxarifado_id = alm.id"); 259 sql.append(" left join estruturaorganizacional alm on req_c.almoxarifado_id = alm.id");
260 sql.append(" left join estruturaorganizacional requisitante on req_c.unidadeRequisitante_id = requisitante.id"); 260 sql.append(" left join estruturaorganizacional requisitante on req_c.unidadeRequisitante_id = requisitante.id");
261 sql.append(" left join localizacao locale on requisitante.localizacao_id = locale.id"); 261 sql.append(" left join localizacao locale on requisitante.localizacao_id = locale.id");
262 sql.append(" left join centrocusto c_custo on req_c.centrocusto_id = c_custo.id"); 262 sql.append(" left join centrocusto c_custo on req_c.centrocusto_id = c_custo.id");
263 sql.append(" left join seguranca_usuario usuario on req_c.autor_id = usuario.id"); 263 sql.append(" left join seguranca_usuario usuario on req_c.autor_id = usuario.id");
264 - sql.append(" left join pessoa pessoa_req on pessoa_req.usuario_id = usuario.id");  
265 sql.append(" where req_c.id = ").append(requisicaoId); 264 sql.append(" where req_c.id = ").append(requisicaoId);
266 - return executSQL(sql);  
267 - }  
268 -  
269 - private Object[] executSQL(StringBuilder sql) {  
270 - return (Object[]) usuarioService.singleResultNativeQuery(sql.toString()); 265 +
  266 + return (Object[])usuarioService.singleResultNativeQuery(sql.toString());
271 } 267 }
272 } 268 }
273 \ No newline at end of file 269 \ No newline at end of file