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

fixes bug#10852 

dev:fabio
qua:marcelo

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@80799 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2018-04-13 13:52:52 +00:00
parent 8202efdbb2
commit 54475f5465
1 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
View File

@ -468,9 +468,11 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
}
private boolean validaAltaTemporada(List<EmpresaImposto> impostos, int mes, int estadoId) {
private boolean validaAltaTemporada(List<EmpresaImposto> impostos, Integer mes, Integer estadoId) {
if(impostos != null && mes != null && estadoId != null) {
for (EmpresaImposto ei : impostos) {
if(ei.getEstado() != null) {
if (ei.getEstado().getEstadoId().equals(estadoId)) {
switch (mes) {
case Calendar.JANUARY:
@ -502,6 +504,9 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
}
}
}
}
}
return false;
}
@ -753,11 +758,15 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
private List<EventosFinanceirosVO> verificaEventoFinanceiroProDia(List<EventosFinanceirosVO> eventosFinanceirosVOs, Date dataRegistro) {
List<EventosFinanceirosVO> aux = new ArrayList<EventosFinanceirosVO>();
if(eventosFinanceirosVOs != null) {
for (EventosFinanceirosVO rcc : eventosFinanceirosVOs) {
if(rcc.getFeccorte() != null) {
if (DateUtil.compareOnlyDate(rcc.getFeccorte(), dataRegistro) == 0) {
aux.add(rcc);
}
}
}
}
return aux;
}