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

Merge pull request 'fixes bug#AL-4309' (!198) from AL-4309 into master 

Reviewed-on: adm/ModelWeb#198
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master
Célio de Souza Ribeiro JR 2024-06-16 19:40:25 +00:00
parent ebc9334098 975f11cab3
commit d0715013c5
3 changed files with 15 additions and 3 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.62.1</version>
<version>1.63.0</version>
<distributionManagement>
<repository>

6
src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java
View File

@ -50,7 +50,7 @@ public class ReceitaDespesaHibernateDAO implements ReceitaDespesaDAO {
sql.append(" SELECT ")
.append("LISTAGG(fp.cvepago||' /'||CAST(cfp.IMPORTE AS VARCHAR(10)),';') WITHIN GROUP( ORDER BY 1 DESC ) AS descpago,")
.append(" C.FECHORVTA, P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, ")
.append(" C.NUMSERIEPREIMPRESA, C.NUMFOLIOPREIMPRESO, E.NUMDOCUMENTO,E.EVENTOEXTRA_ID, TE.CVETIPOEVENTO, E.BOLETO_ID ")
.append(" C.NUMSERIEPREIMPRESA, C.NUMFOLIOPREIMPRESO, E.NUMDOCUMENTO,E.EVENTOEXTRA_ID, TE.CVETIPOEVENTO, E.BOLETO_ID, E.DESCINFO ")
.append(" FROM CAJA_DIVERSOS C ")
.append(" JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ")
.append(" JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ")
@ -74,7 +74,8 @@ public class ReceitaDespesaHibernateDAO implements ReceitaDespesaDAO {
.append("e.numdocumento, ")
.append("e.eventoextra_id, ")
.append("te.cvetipoevento, ")
.append("e.boleto_id ");
.append("e.boleto_id, ")
.append("e.descinfo ");
sql.append("ORDER BY C.FECHORVTA, TE.DESCTIPOEVENTO, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA");
@ -98,6 +99,7 @@ public class ReceitaDespesaHibernateDAO implements ReceitaDespesaDAO {
bean.setNumSeriePreImpresa(resultSet.getString("NUMSERIEPREIMPRESA"));
bean.setNumFolioPreImpreso(resultSet.getString("NUMFOLIOPREIMPRESO"));
bean.setCveTipoEvento(resultSet.getString("CVETIPOEVENTO"));
bean.setDescricao(resultSet.getString("DESCINFO"));
if (bean.getCveTipoEvento() != null && tiposEventosSubstituir.contains(bean.getCveTipoEvento())) {
bean.setNumDocumento(resultSet.getString("BOLETO_ID"));

10
src/com/rjconsultores/ventaboletos/relatorios/receitaDespesa/RelatorioFinanceiroReceitasDespesasBean.java
View File

@ -30,6 +30,7 @@ public class RelatorioFinanceiroReceitasDespesasBean {
private BigDecimal ValorFormaPagamento3;
private String cveTipoEvento;
private String boletoId;
private String descricao;
public Date getFecHorVta() {
return fecHorVta;
@ -221,4 +222,13 @@ public class RelatorioFinanceiroReceitasDespesasBean {
public void setBoletoId(String boletoId) {
this.boletoId = boletoId;
}
public String getDescricao() {
return descricao;
}
public void setDescricao(String descricao) {
this.descricao = descricao;
}
}