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

fixes bug #10407 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78203 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2018-01-19 20:40:39 +00:00
parent 68e6b990c3
commit af2238ed59
2 changed files with 8 additions and 4 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

@ -150,7 +150,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
private void carregarPuntoVentas(List<ConferenciaComissaoVO> lsConferencias, Date dataInicial, Date dataFinal, private void carregarPuntoVentas(List<ConferenciaComissaoVO> lsConferencias, Date dataInicial, Date dataFinal,
Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws BusinessException { Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws BusinessException {
Set<Integer> diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal, dataMovimento); Set<Integer> diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal);
ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO();
conferenciaComissao.setPuntoventaId(puntoVenta.getPuntoventaId()); conferenciaComissao.setPuntoventaId(puntoVenta.getPuntoventaId());
conferenciaComissao.setNombpuntoventa(puntoVenta.getNombpuntoventa()); conferenciaComissao.setNombpuntoventa(puntoVenta.getNombpuntoventa());
@ -335,8 +335,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
List<ConferenciaComissaoVO> lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException { List<ConferenciaComissaoVO> lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException {
Set<Integer> diasSemMovimentos = new TreeSet<Integer>(); Set<Integer> diasSemMovimentos = new TreeSet<Integer>();
if (dataMovimento != null) { if(dataInicial != null && dataFinal != null) {
DateUtil.carregarDiasCompetencia(competencia, dataMovimento); diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal);
}
if (competencia != null) {
diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento);
} }
for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) { for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) {

2
src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java
View File

@ -612,7 +612,7 @@ public final class DateUtil {
return diasCompetencia; return diasCompetencia;
} }
public static Set<Integer> carregarDiasCompetencia(Date dataInicial, Date dataFinal, Date dataMovimento) { public static Set<Integer> carregarDiasCompetencia(Date dataInicial, Date dataFinal) {
Set<Integer> diasCompetencia = new TreeSet<Integer>(); Set<Integer> diasCompetencia = new TreeSet<Integer>();
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();