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

Issue #10054: ESPEC 001 Santa Cruz - Arredondamento ARTESP 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@76414 d1611594-4594-4d17-8e1d-87c2c4800839
master
luis 2017-11-14 17:36:45 +00:00
parent 815435c9a0
commit 613f8afeef
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java
View File

@ -16,5 +16,6 @@ public interface RedondeoCtrlDAO extends GenericDAO<RedondeoCtrl, Integer> {
public List<RedondeoCtrl> buscar(RedondeoCtrl redondeoCtrl);
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing);
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento,
Boolean indaplicapricing, Boolean indaplicaAtersp);
}

11
src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java
View File

@ -57,7 +57,8 @@ public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO<RedondeoCtrl,
}
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing) {
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento,
Boolean indaplicapricing, Boolean indaplicaAtersp) {
String ids = "";
for (int i = 0; i < iDMarcas.length; i++) {
@ -70,7 +71,9 @@ public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO<RedondeoCtrl,
hql.append(" join rc.redondeoList r ");
hql.append(" join rc.redondeoMarcaList rm ");
hql.append(" where rc.activo = 1 and r.activo = 1 and rm.activo = 1 ");
if (indaplicadescuento && !indaplicapricing) {
if (indaplicaAtersp) {
hql.append(" and rc.indaplicaArtesp = :aplicaArtesp ");
} else if (indaplicadescuento && !indaplicapricing) {
hql.append(" and rc.indaplicadescuento = :aplicaDescuento ");
} else if (!indaplicadescuento && indaplicapricing) {
hql.append(" and rc.indaplicapricing = :aplicaPricing ");
@ -90,7 +93,9 @@ public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO<RedondeoCtrl,
sq.setDouble("vlrIni", valorinicial.doubleValue());
sq.setDouble("vlrFin", valorfinal.doubleValue());
if (indaplicadescuento && !indaplicapricing) {
if (indaplicaAtersp) {
sq.setBoolean("aplicaArtesp", indaplicaAtersp);
} else if (indaplicadescuento && !indaplicapricing) {
sq.setBoolean("aplicaDescuento", indaplicadescuento);
} else if (!indaplicadescuento && indaplicapricing) {
sq.setBoolean("aplicaPricing", indaplicapricing);

10
src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java
View File

@ -40,6 +40,8 @@ public class RedondeoCtrl implements Serializable {
private Boolean indaplicadescuento;
@Column(name = "INDAPLICAPRICING")
private Boolean indaplicapricing;
@Column(name = "INDAPLICAARTESP")
private Boolean indaplicaArtesp;
@Column(name = "ACTIVO")
private Boolean activo;
@Column(name = "FECMODIF")
@ -159,4 +161,12 @@ public class RedondeoCtrl implements Serializable {
public String toString() {
return "com.rjconsultores.ventaboletos.entidad.RedondeoCtrl[redondeoctrlId=" + redondeoctrlId + "]";
}
public Boolean getIndaplicaArtesp() {
return indaplicaArtesp;
}
public void setIndaplicaArtesp(Boolean indaplicaArtesp) {
this.indaplicaArtesp = indaplicaArtesp;
}
}

3
src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java
View File

@ -16,5 +16,6 @@ public interface RedondeoCtrlService extends GenericService<RedondeoCtrl, Intege
public List<RedondeoCtrl> buscar(RedondeoCtrl redondeoCtrl);
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing);
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento,
Boolean indaplicapricing, Boolean indaplicaAtersp);
}

5
src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java
View File

@ -80,7 +80,8 @@ public class RedondeoCtrlServiceImpl implements RedondeoCtrlService {
return redondeoCtrlDAO.buscar(redondeoCtrl);
}
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing) {
return redondeoCtrlDAO.buscarTraslapa(iDMarcas, valorinicial, valorfinal, indaplicadescuento, indaplicapricing);
public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento,
Boolean indaplicapricing, Boolean indaplicaAtersp) {
return redondeoCtrlDAO.buscarTraslapa(iDMarcas, valorinicial, valorfinal, indaplicadescuento, indaplicapricing, indaplicaAtersp);
}
}