bug#11600

dev: julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@85212 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-09-11 13:45:10 +00:00
parent ffacbe0f69
commit 4067be8d61
1 changed files with 9 additions and 10 deletions

View File

@ -46,9 +46,8 @@ public class RelatorioFolioRmd extends Relatorio {
stmt.setInt("empresaId", empresa.getEmpresaId());
stmt.setInt("estadoId", estado.getEstadoId());
stmt.setLong("rmdId", aidf.getAidfId());
stmt.setDate("dataInicial", new java.sql.Date (dataInicial.getTime()));
stmt.setDate("dataFinal", new java.sql.Date (dataFinal.getTime()));
stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime()));
ResultSet rset = stmt.executeQuery();
listdata = new ArrayList<FolioRMD>();
@ -96,18 +95,18 @@ public class RelatorioFolioRmd extends Relatorio {
StringBuilder sql = new StringBuilder();
sql.append("select f.folio as foliormd, ");
sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'IMPRESSO' end as status, ");
sql.append(" case when f.indcancelacion = 1 then to_char(f.fecmodif, 'yyyymmdd') else to_char(f.fechorfolio, 'yyyymmdd') end as fechorfolio, ");
sql.append(" to_char(f.fechorfolio, 'yyyymmdd') as fechorfolio, ");
sql.append(" e.nombempresa as empresa, ");
sql.append(" eo.cveestado as uf, ");
sql.append(" eo.nombestado as estado, ");
sql.append(" ai.docfiscal as doc, ");
sql.append(" case when f.indecf = 1 then 'ECF' else 'BPR' end as tipo, ");
sql.append(" f.valorcontabil as valorContabil, ");
sql.append(" f.basecalculo as baseCalculo, ");
sql.append(" f.aliquota as aliquota, ");
sql.append(" f.isentos as isentos, ");
sql.append(" f.outros as outros, ");
sql.append(" f.icms as icms ");
sql.append(" case when f.indcancelacion = 1 then 0 else f.valorcontabil end as valorContabil, ");
sql.append(" case when f.indcancelacion = 1 then 0 else f.basecalculo end as baseCalculo, ");
sql.append(" case when f.indcancelacion = 1 then 0 else f.aliquota end as aliquota, ");
sql.append(" case when f.indcancelacion = 1 then 0 else f.isentos end as isentos, ");
sql.append(" case when f.indcancelacion = 1 then 0 else f.outros end as outros, ");
sql.append(" case when f.indcancelacion = 1 then 0 else f.icms end as icms ");
sql.append("from folio_consumo_rmd f ");
sql.append(" inner join aidf ai on f.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 ");
sql.append(" inner join empresa e on e.empresa_id = f.empresa_id ");