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

fixes bug #8731 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@66475 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-03-07 20:20:27 +00:00
parent d285cf1d3a
commit ed7356d781
6 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/CajaDAO.java
View File

@ -21,5 +21,5 @@ public interface CajaDAO {
public void gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoException, VendaEmbarcadaBoletoFormapagoException, VendaEmbarcadaCajaException, VendaEmbarcadaCajaFormapagoException;
public List<CajaDetalleVO> buscarDetalleCaja(Date fechaDesde, Date fechaHasta);
public List<CajaDetalleVO> buscarDetalleCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote);
}

20
src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
View File

@ -15,6 +15,7 @@ import org.hibernate.type.DateType;
import org.hibernate.type.IntegerType;
import org.hibernate.type.LongType;
import org.hibernate.type.StringType;
import org.hibernate.type.TimestampType;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@ -73,8 +74,8 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
.addScalar("tipoVentaId", IntegerType.INSTANCE)
.addScalar("numSeriePreimpresa", StringType.INSTANCE)
.addScalar("numFolioPreImpreso", StringType.INSTANCE)
.addScalar("fecHorViaje", DateType.INSTANCE)
.addScalar("fecHorVenta", DateType.INSTANCE)
.addScalar("fecHorViaje", TimestampType.INSTANCE)
.addScalar("fecHorVenta", TimestampType.INSTANCE)
.addScalar("puntoVentaId", IntegerType.INSTANCE)
.addScalar("numPuntoVenta", StringType.INSTANCE)
.addScalar("numKmViaje", BigDecimalType.INSTANCE)
@ -107,9 +108,9 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
return list;
}
@Override
public List<CajaDetalleVO> buscarDetalleCaja(Date fechaDesde, Date fechaHasta) {
public List<CajaDetalleVO> buscarDetalleCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote) {
String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarDatosCaja(fechaDesde, fechaHasta);
String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarDatosCaja(fechaDesde, fechaHasta, sembilhetesPacote);
SQLQuery sql = getSession().createSQLQuery(sqlBuscarCajaFecha)
.addScalar("cajaId", LongType.INSTANCE)
@ -128,8 +129,8 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
.addScalar("tipoVentaId", IntegerType.INSTANCE)
.addScalar("numSeriePreimpresa", StringType.INSTANCE)
.addScalar("numFolioPreImpreso", StringType.INSTANCE)
.addScalar("fecHorViaje", DateType.INSTANCE)
.addScalar("fecHorVenta", DateType.INSTANCE)
.addScalar("fecHorViaje", TimestampType.INSTANCE)
.addScalar("fecHorVenta", TimestampType.INSTANCE)
.addScalar("puntoVentaId", IntegerType.INSTANCE)
.addScalar("numPuntoVenta", StringType.INSTANCE)
.addScalar("numKmViaje", BigDecimalType.INSTANCE)
@ -152,7 +153,12 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
.addScalar("vlrFormaPago", BigDecimalType.INSTANCE)
.addScalar("descMotivo", StringType.INSTANCE)
.addScalar("transacaoId", LongType.INSTANCE)
.addScalar("transacaooriginalId", LongType.INSTANCE);
.addScalar("transacaooriginalId", LongType.INSTANCE)
.addScalar("descnumdoc", StringType.INSTANCE)
.addScalar("descnumdoc2", StringType.INSTANCE)
.addScalar("desctipodoc", StringType.INSTANCE)
.addScalar("desctipodoc2", StringType.INSTANCE)
.addScalar("desctelefono", StringType.INSTANCE);
sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class));

2
src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java
View File

@ -114,5 +114,5 @@ public interface SQLBuilder {
*/
public String getSQLObterSequenciaNumOperacion();
public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta);
public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote);
}

25
src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
View File

@ -886,7 +886,7 @@ public class SQLBuilderOracle implements SQLBuilder {
return sb.toString();
}
@Override
public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta) {
public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
StringBuilder sb = new StringBuilder("");
@ -927,14 +927,15 @@ public class SQLBuilderOracle implements SQLBuilder {
sb.append(" co.ruta_id as \"rutaId\", ");
sb.append(" c.usuario_id as \"usuarioId\", ");
sb.append(" ct.numautorizacion as \"numAutorizacion\", ");
sb.append(" fp.DESCPAGO as \"descPago\", ");
sb.append(" fp.formapago_id as \"formaPagoId\", ");
sb.append(" cfp.importe as \"vlrFormaPago\", ");
sb.append(" ca.CVECATEGORIA as \"cveCategoria\", ");
sb.append(" mc.DESCMOTIVO as \"descMotivo\", ");
sb.append(" fp.DESCPAGO as \"descPago\", ");
sb.append(" fp.formapago_id as \"formaPagoId\", ");
sb.append(" cfp.importe as \"vlrFormaPago\", ");
sb.append(" ca.CVECATEGORIA as \"cveCategoria\", ");
sb.append(" mc.DESCMOTIVO as \"descMotivo\", ");
sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\", ");
sb.append(" C.TRANSACAO_ID as \"transacaoId\", C.TRANSACAOORIGINAL_ID as \"transacaooriginalId\" ");
sb.append(" ");
sb.append(" C.TRANSACAO_ID as \"transacaoId\", C.TRANSACAOORIGINAL_ID as \"transacaooriginalId\", ");
sb.append(" C.DESCNUMDOC as \"descnumdoc\", C.DESCNUMDOC2 as \"descnumdoc2\", C.DESCTIPODOC as \"desctipodoc\", ");
sb.append(" C.DESCTIPODOC2 as \"desctipodoc2\", C.DESCTELEFONO as \"desctelefono\" ");
sb.append(" from ");
sb.append(" caja c ");
sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida ");
@ -944,10 +945,16 @@ public class SQLBuilderOracle implements SQLBuilder {
sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id ");
sb.append(" inner join forma_pago fp on fp.formapago_id = cfp.FORMAPAGO_ID ");
sb.append(" inner join categoria ca on ca.categoria_id = c.categoria_id ");
sb.append(" left join motivo_cancelacion mc on mc.motivocancelacion_id = c.motivocancelacion_id ");
sb.append(" left join motivo_cancelacion mc on mc.motivocancelacion_id = c.motivocancelacion_id ");
sb.append(" left join tarifa_venda_pacote tvp on tvp.boleto_id = c.transacao_id ");
sb.append(" ");
sb.append(" where ");
sb.append(" trunc(fechorventa) between to_date('").append(sdf.format(fechaDesde)).append("','yyyy-MM-dd') and ").append(" to_date('").append(sdf.format(fechaHasta)).append("','yyyy-MM-dd')");
if(sembilhetesPacote != null && sembilhetesPacote) {
sb.append("and tvp.tarifavendapacote_id is null ");
}
sb.append(" order by c.fechorventa,c.usuario_id,c.caja_id asc ");
return sb.toString();

36
src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java
View File

@ -61,6 +61,12 @@ public class CajaDetalleVO {
private Long transacaoId;
private Long transacaooriginalId;
private String descnumdoc;
private String descnumdoc2;
private String desctipodoc;
private String desctipodoc2;
private String desctelefono;
public Long getCajaId() {
return cajaId;
}
@ -353,5 +359,35 @@ public class CajaDetalleVO {
public void setTransacaooriginalId(Long transacaooriginalId) {
this.transacaooriginalId = transacaooriginalId;
}
public String getDescnumdoc() {
return descnumdoc;
}
public void setDescnumdoc(String descnumdoc) {
this.descnumdoc = descnumdoc;
}
public String getDescnumdoc2() {
return descnumdoc2;
}
public void setDescnumdoc2(String descnumdoc2) {
this.descnumdoc2 = descnumdoc2;
}
public String getDesctipodoc() {
return desctipodoc;
}
public void setDesctipodoc(String desctipodoc) {
this.desctipodoc = desctipodoc;
}
public String getDesctipodoc2() {
return desctipodoc2;
}
public void setDesctipodoc2(String desctipodoc2) {
this.desctipodoc2 = desctipodoc2;
}
public String getDesctelefono() {
return desctelefono;
}
public void setDesctelefono(String desctelefono) {
this.desctelefono = desctelefono;
}
}

10
src/com/rjconsultores/ventaboletos/ws/rs/CajaRS.java
View File

@ -48,12 +48,13 @@ public class CajaRS {
@Path("/detalleCajas")
@GET
@Produces({ MediaType.APPLICATION_XML })
public List<CajaDetalleVO> buscarDetalleCaja(@QueryParam("fecDesde") String fecDesde, @QueryParam("fecHasta") String fecHasta) {
public List<CajaDetalleVO> buscarDetalleCaja(@QueryParam("fecDesde") String fecDesde, @QueryParam("fecHasta") String fecHasta, @QueryParam("sembilhetesPacote") String sembilhetesPacote) {
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy");
Date fecDesdeD = new Date();
Date fecHastaD = new Date();
Boolean bSembilhetesPacote = Boolean.FALSE;
try {
fecDesdeD = StringUtils.isBlank(fecDesde) ? new Date() : sdf.parse(fecDesde);
@ -64,10 +65,15 @@ public class CajaRS {
fecHastaD = StringUtils.isBlank(fecHasta) ? new Date() : sdf.parse(fecHasta);
} catch (Exception e) {
}
try {
bSembilhetesPacote = StringUtils.isBlank(sembilhetesPacote) ? Boolean.FALSE : Boolean.valueOf(sembilhetesPacote);
} catch (Exception e) {
}
CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO");
List<CajaDetalleVO> list = cajaDAO.buscarDetalleCaja(fecDesdeD, fecHastaD);
List<CajaDetalleVO> list = cajaDAO.buscarDetalleCaja(fecDesdeD, fecHastaD, bSembilhetesPacote);
return list;
}