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

fixed bug #7908 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60215 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-09-12 18:21:42 +00:00
parent 0a1d859825
commit ee363c6cda
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -673,7 +673,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("BO1.TIPOVENTA_ID \"tipoVentaOriginal1\", BO2.TIPOVENTA_ID \"tipoVentaOriginal2\", OCD.OCD_ID \"ocdId\", ") .append("BO1.TIPOVENTA_ID \"tipoVentaOriginal1\", BO2.TIPOVENTA_ID \"tipoVentaOriginal2\", OCD.OCD_ID \"ocdId\", ")
.append("B.NOMBPASAJERO AS \"nombpasajero\", E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", ") .append("B.NOMBPASAJERO AS \"nombpasajero\", E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", ")
.append("B.FECCORRIDA AS \"feccorrida\", B.CORRIDA_ID \"corridaId\", B.BOLETOORIGINAL_ID AS \"boletoOriginalId\", ") .append("B.FECCORRIDA AS \"feccorrida\", B.CORRIDA_ID \"corridaId\", B.BOLETOORIGINAL_ID AS \"boletoOriginalId\", ")
.append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\" ") .append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\", ")
.append("tarifa.PRECIO AS \"valorBilhete\"")
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append("LEFT JOIN BOLETO BO1 ON BO1.BOLETO_ID = B.BOLETOORIGINAL_ID ") .append("LEFT JOIN BOLETO BO1 ON BO1.BOLETO_ID = B.BOLETOORIGINAL_ID ")
.append("LEFT JOIN BOLETO BO2 ON BO2.BOLETO_ID = BO1.BOLETOORIGINAL_ID ") .append("LEFT JOIN BOLETO BO2 ON BO2.BOLETO_ID = BO1.BOLETOORIGINAL_ID ")
@ -691,8 +692,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
.append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ") .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
.append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ") .append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ")
.append("INNER JOIN TARIFA tarifa ON (tarifa.RUTA_ID = B.RUTA_ID AND tarifa.ORIGEN_ID = B.ORIGEN_ID AND tarifa.DESTINO_ID = B.DESTINO_ID) ")
.append("INNER JOIN VIGENCIA_TARIFA vigenciaTarifa ON (vigenciaTarifa.VIGENCIATARIFA_ID = tarifa.VIGENCIATARIFA_ID) ")
.append("WHERE B.ACTIVO = 1 ") .append("WHERE B.ACTIVO = 1 ")
.append("AND B.FECHORVENTA BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') "); .append("AND B.FECHORVENTA BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ")
.append("AND B.FECHORVENTA BETWEEN vigenciaTarifa.FECINICIOVIGENCIA AND vigenciaTarifa.FECFINVIGENCIA ");
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {
sQuery.append("AND M.EMPRESA_ID = :empresaId "); sQuery.append("AND M.EMPRESA_ID = :empresaId ");
@ -716,6 +721,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.addScalar("numFolioPreImpreso", Hibernate.STRING) .addScalar("numFolioPreImpreso", Hibernate.STRING)
.addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING) .addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING)
.addScalar("valorpagado", Hibernate.BIG_DECIMAL) .addScalar("valorpagado", Hibernate.BIG_DECIMAL)
.addScalar("valorBilhete", Hibernate.BIG_DECIMAL)
.addScalar("seguroOutros", Hibernate.BIG_DECIMAL) .addScalar("seguroOutros", Hibernate.BIG_DECIMAL)
.addScalar("pedagio", Hibernate.BIG_DECIMAL) .addScalar("pedagio", Hibernate.BIG_DECIMAL)
.addScalar("seguro", Hibernate.BIG_DECIMAL) .addScalar("seguro", Hibernate.BIG_DECIMAL)

9
src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
View File

@ -24,6 +24,7 @@ public class BoletoComissao {
private Integer motivoCancelacionOriginal2; private Integer motivoCancelacionOriginal2;
private String descmotivocancelacion; private String descmotivocancelacion;
private BigDecimal valorpagado; private BigDecimal valorpagado;
private BigDecimal valorBilhete;
private BigDecimal seguro; private BigDecimal seguro;
private BigDecimal pedagio; private BigDecimal pedagio;
private BigDecimal embarque; private BigDecimal embarque;
@ -867,6 +868,14 @@ public class BoletoComissao {
this.corridaId = corridaId; this.corridaId = corridaId;
} }
public BigDecimal getValorBilhete() {
return valorBilhete;
}
public void setValorBilhete(BigDecimal valorBilhete) {
this.valorBilhete = valorBilhete;
}
public String getFeccorridaServico() { public String getFeccorridaServico() {
StringBuilder str = new StringBuilder(); StringBuilder str = new StringBuilder();
if (getFeccorrida() != null) { if (getFeccorrida() != null) {