fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#13207 

dev:julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@88781 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-01-11 18:15:05 +00:00
parent 56ba50dd4d
commit cd49a3334e
5 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -102,7 +102,7 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/GeneradorBoletosCNAB"/> <classpathentry combineaccessrules="false" kind="src" path="/GeneradorBoletosCNAB"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_144"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>

1
.project
View File

@ -11,6 +11,7 @@
<project>GeneradorBoletosCNAB</project> <project>GeneradorBoletosCNAB</project>
<project>WSTotvs</project> <project>WSTotvs</project>
<project>Flyway</project> <project>Flyway</project>
<project>GeneradorBoletosCNAB</project>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>

14
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -404,10 +404,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(" LEFT JOIN BOLETO BANT ON BANT.BOLETO_ID = (CASE WHEN BPEORI.TIPOEVENTO IS NOT NULL THEN COALESCE(B.BOLETOANTERIOR_ID, B.BOLETOORIGINAL_ID) ELSE NULL END) "); sql.append(" LEFT JOIN BOLETO BANT ON BANT.BOLETO_ID = (CASE WHEN BPEORI.TIPOEVENTO IS NOT NULL THEN COALESCE(B.BOLETOANTERIOR_ID, B.BOLETOORIGINAL_ID) ELSE NULL END) ");
sql.append(" LEFT JOIN BPE BPEANT ON BPEANT.BOLETO_ID = BANT.BOLETO_ID "); sql.append(" LEFT JOIN BPE BPEANT ON BPEANT.BOLETO_ID = BANT.BOLETO_ID ");
sql.append(" LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = COALESCE(BANT.PUNTOVENTA_ID, BORI.PUNTOVENTA_ID,B.PTOVTAVENTA_ID) "); sql.append(" LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = COALESCE(BANT.PUNTOVENTA_ID, BORI.PUNTOVENTA_ID,B.PTOVTAVENTA_ID) ");
sql.append("WHERE (BPE.CODSTAT IN (100,135,150) AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL "); sql.append("WHERE (BPE.CODSTAT IN (100,101,102,135,150) AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL ");
sql.append(" OR (BPE.CODSTAT = 135 AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) ) "); sql.append(" OR (BPE.CODSTAT IN (101,135) AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) ) ");
sql.append(" AND (BPE.CODSTAT IN (100,135,150) AND BPE.TIPOEVENTO <> 110115 OR BPE.TIPOEVENTO IS NULL) "); sql.append(" AND (BPE.CODSTAT IN (100,101,102,135,150) AND BPE.TIPOEVENTO <> 110115 OR BPE.TIPOEVENTO IS NULL) ");
sql.append(" AND (BPEORI.CODSTAT IN (100,135,150) AND BPEORI.TIPOEVENTO <> 110115 OR BPEORI.TIPOEVENTO IS NULL) "); sql.append(" AND (BPEORI.CODSTAT IN (100,101,102,135,150) AND BPEORI.TIPOEVENTO <> 110115 OR BPEORI.TIPOEVENTO IS NULL) ");
if (dataDevolucaoInicial != null) { if (dataDevolucaoInicial != null) {
sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') ");
} }
@ -495,9 +495,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append("LEFT JOIN BPE BPEANT ON BPEANT.BOLETO_ID = BANT.BOLETO_ID "); sql.append("LEFT JOIN BPE BPEANT ON BPEANT.BOLETO_ID = BANT.BOLETO_ID ");
sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = COALESCE(BANT.PUNTOVENTA_ID, BORI.PUNTOVENTA_ID,B.PTOVTAVENTA_ID) "); sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = COALESCE(BANT.PUNTOVENTA_ID, BORI.PUNTOVENTA_ID,B.PTOVTAVENTA_ID) ");
sql.append("WHERE "); sql.append("WHERE ");
sql.append(" (BPE.CODSTAT = 135 AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) "); sql.append(" (BPE.CODSTAT IN (101,135) AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) ");
sql.append(" AND (BPE.CODSTAT IN (100,135,150) AND BPE.TIPOEVENTO <> 110115 OR BPE.TIPOEVENTO IS NULL) "); sql.append(" AND (BPE.CODSTAT IN (100,101,102,135,150) AND BPE.TIPOEVENTO <> 110115 OR BPE.TIPOEVENTO IS NULL) ");
sql.append(" AND (BPEORI.CODSTAT IN (100,135,150) AND BPEORI.TIPOEVENTO <> 110115 OR BPEORI.TIPOEVENTO IS NULL) "); sql.append(" AND (BPEORI.CODSTAT IN (100,101,102,135,150) AND BPEORI.TIPOEVENTO <> 110115 OR BPEORI.TIPOEVENTO IS NULL) ");
if (dataDevolucaoInicial != null) { if (dataDevolucaoInicial != null) {
sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') ");
} }

14
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java
View File

@ -540,10 +540,10 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
sql.append(" left join boleto bant on bant.boleto_id = (case when bpeori.tipoevento is not null then coalesce(b.boletoanterior_id, b.boletooriginal_id) else null end) "); sql.append(" left join boleto bant on bant.boleto_id = (case when bpeori.tipoevento is not null then coalesce(b.boletoanterior_id, b.boletooriginal_id) else null end) ");
sql.append(" left join bpe bpeant on bpeant.boleto_id = bant.boleto_id "); sql.append(" left join bpe bpeant on bpeant.boleto_id = bant.boleto_id ");
sql.append(" left join punto_venta ptvo on ptvo.puntoventa_id = coalesce(bant.puntoventa_id, bori.puntoventa_id,b.ptovtaventa_id) "); sql.append(" left join punto_venta ptvo on ptvo.puntoventa_id = coalesce(bant.puntoventa_id, bori.puntoventa_id,b.ptovtaventa_id) ");
sql.append("where ( (bpe.codstat in (100,135,150) and bpe.chbpe_substituicao is not null) "); sql.append("where ( (bpe.codstat in (100,101,102,135,150) and bpe.chbpe_substituicao is not null) ");
sql.append(" or (bpe.codstat = 135 and to_char(b.feccreacion, 'mm/yyyy') < to_char(bori.feccreacion, 'mm/yyyy')) ) "); sql.append(" or (bpe.codstat in (101,135) and to_char(b.feccreacion, 'mm/yyyy') < to_char(bori.feccreacion, 'mm/yyyy')) ) ");
sql.append(" and (bpe.codstat in (100,135,150) and bpe.tipoevento <> 110115 or bpe.tipoevento is null) "); sql.append(" and (bpe.codstat in (100,101,102,135,150) and bpe.tipoevento <> 110115 or bpe.tipoevento is null) ");
sql.append(" and (bpeori.codstat in (100,135,150) and bpeori.tipoevento <> 110115 or bpeori.tipoevento is null) "); sql.append(" and (bpeori.codstat in (100,101,102,135,150) and bpeori.tipoevento <> 110115 or bpeori.tipoevento is null) ");
sql.append(" and bori.feccreacion >= :DATE_INICIO and bori.feccreacion <= :DATE_FIM "); sql.append(" and bori.feccreacion >= :DATE_INICIO and bori.feccreacion <= :DATE_FIM ");
sql.append(" and e.empresa_id = :EMPRESA_ID "); sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(ufs == null ? "" : " and est_bpe.estado_id in ( " + ufs + " ) "); sql.append(ufs == null ? "" : " and est_bpe.estado_id in ( " + ufs + " ) ");
@ -599,9 +599,9 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
sql.append("left join bpe bpeant on bpeant.boleto_id = bant.boleto_id "); sql.append("left join bpe bpeant on bpeant.boleto_id = bant.boleto_id ");
sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = coalesce(bant.puntoventa_id, bori.puntoventa_id,b.ptovtaventa_id) "); sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = coalesce(bant.puntoventa_id, bori.puntoventa_id,b.ptovtaventa_id) ");
sql.append("where "); sql.append("where ");
sql.append(" (bpe.codstat = 135 and to_char(b.feccreacion, 'mm/yyyy') < to_char(bori.feccreacion, 'mm/yyyy')) "); sql.append(" (bpe.codstat in (101,135) and to_char(b.feccreacion, 'mm/yyyy') < to_char(bori.feccreacion, 'mm/yyyy')) ");
sql.append(" and (bpe.codstat in (100,135,150) and bpe.tipoevento <> 110115 or bpe.tipoevento is null) "); sql.append(" and (bpe.codstat in (100,101,102,135,150) and bpe.tipoevento <> 110115 or bpe.tipoevento is null) ");
sql.append(" and (bpeori.codstat in (100,135,150) and bpeori.tipoevento <> 110115 or bpeori.tipoevento is null) "); sql.append(" and (bpeori.codstat in (100,101,102,135,150) and bpeori.tipoevento <> 110115 or bpeori.tipoevento is null) ");
sql.append(" and bori.feccreacion >= :DATE_INICIO and bori.feccreacion <= :DATE_FIM "); sql.append(" and bori.feccreacion >= :DATE_INICIO and bori.feccreacion <= :DATE_FIM ");
sql.append(" and e.empresa_id = :EMPRESA_ID "); sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(ufs == null ? "" : " and est_bpe.estado_id in ( " + ufs + " ) "); sql.append(ufs == null ? "" : " and est_bpe.estado_id in ( " + ufs + " ) ");

40
src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java
View File

@ -91,26 +91,26 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit {
* Executa os sqls novos na base de dados * Executa os sqls novos na base de dados
*/ */
private void executeFlyway() { private void executeFlyway() {
FlyWay.getInstance().defineDataSource(getDataSoure()); // FlyWay.getInstance().defineDataSource(getDataSoure());
FlyWay.getInstance().start(); // FlyWay.getInstance().start();
//
log.info("Executando Flyway..."); // log.info("Executando Flyway...");
//
try{ // try{
final Flyway flyway = new Flyway(); // final Flyway flyway = new Flyway();
//
flyway.setDataSource(getDataSoure()); // flyway.setDataSource(getDataSoure());
flyway.setValidateOnMigrate(false); // flyway.setValidateOnMigrate(false);
flyway.setIgnoreFutureMigrations(true); // flyway.setIgnoreFutureMigrations(true);
flyway.setOutOfOrder(true); // flyway.setOutOfOrder(true);
flyway.setBaselineOnMigrate(true); // flyway.setBaselineOnMigrate(true);
//
flyway.migrate(); // flyway.migrate();
}catch(Throwable t){ // }catch(Throwable t){
log.error("Erro ao executar o flyway",t); // log.error("Erro ao executar o flyway",t);
} // }
//
log.info("Flyway executado."); // log.info("Flyway executado.");
} }
private boolean ipBloqueadoGeracaoServico() { private boolean ipBloqueadoGeracaoServico() {