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

Merge pull request 'bug#AL-3866' (!169) from AL-3866 into master 

Reviewed-on: adm/ModelWeb#169
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master
wallace 2024-03-27 13:56:24 +00:00
parent a1f829d8eb 850e106919
commit 130287727f
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.43.1</version> <version>1.43.2</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

21
src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
View File

@ -475,9 +475,9 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
List<FiscalRdi> rdis = new ArrayList<FiscalRdi>(); List<FiscalRdi> rdis = new ArrayList<FiscalRdi>();
boolean isNoXML = isNoXml() && consultaOtimizada; // boolean isNoXML = isNoXml() && consultaOtimizada;
if (isNoXML) {
StringBuilder sqlVendidos = new StringBuilder(); StringBuilder sqlVendidos = new StringBuilder();
sqlVendidos.append(sqlRelatorioRDIVendidosNoXML(ufs)); sqlVendidos.append(sqlRelatorioRDIVendidosNoXML(ufs));
@ -500,16 +500,15 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
return m1.getEstado().compareTo(m2.getEstado()); return m1.getEstado().compareTo(m2.getEstado());
} }
}); });
} else {
StringBuilder sql = new StringBuilder(); // StringBuilder sql = new StringBuilder();
sql.append(sqlRelatorioRDIVendidosXML(ufs)); // sql.append(sqlRelatorioRDIVendidosXML(ufs));
sql.append(" union all "); // sql.append(" union all ");
sql.append(sqlRelatorioRDICanceladosXML(ufs)); // sql.append(sqlRelatorioRDICanceladosXML(ufs));
//
List<DetalhadoFiscal> list = montaRelatorioRDIXML(connection, inicio, fim, empresaId, ufs, sql.toString()); // List<DetalhadoFiscal> list = montaRelatorioRDIXML(connection, inicio, fim, empresaId, ufs, sql.toString());
rdis.addAll(calcularRelatorioRDIXML(list, isReceitaTerceiros)); // rdis.addAll(calcularRelatorioRDIXML(list, isReceitaTerceiros));
}
return agrupaRdi(rdis); return agrupaRdi(rdis);
} }