Commit 0e2b808fd72964e4c2c74f891b63aa21c11e0af4
Exists in
master
and in
1 other branch
Merge branch 'master' of https://github.com/lightbase/cacic
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
composer.phar
No preview for this file type
src/Cacic/CommonBundle/Entity/ComputadorRepository.php
| @@ -308,7 +308,7 @@ class ComputadorRepository extends EntityRepository | @@ -308,7 +308,7 @@ class ComputadorRepository extends EntityRepository | ||
| 308 | 308 | ||
| 309 | $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador AND log.data >= :dtInicio AND log.data <= :dtFim') | 309 | $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador AND log.data >= :dtInicio AND log.data <= :dtFim') |
| 310 | ->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )) | 310 | ->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )) |
| 311 | - ->setParameter('dtFim', ( $dataFim.' 00:00:00' )); | 311 | + ->setParameter('dtFim', ( $dataFim.' 23:59:59' )); |
| 312 | 312 | ||
| 313 | } | 313 | } |
| 314 | 314 | ||
| @@ -344,7 +344,7 @@ class ComputadorRepository extends EntityRepository | @@ -344,7 +344,7 @@ class ComputadorRepository extends EntityRepository | ||
| 344 | 344 | ||
| 345 | $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador AND log.data >= :dtInicio AND log.data <= :dtFim') | 345 | $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador AND log.data >= :dtInicio AND log.data <= :dtFim') |
| 346 | ->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )) | 346 | ->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )) |
| 347 | - ->setParameter('dtFim', ( $dataFim.' 00:00:00' )); | 347 | + ->setParameter('dtFim', ( $dataFim.' 23:59:59' )); |
| 348 | } | 348 | } |
| 349 | 349 | ||
| 350 | if ( $idRede ) | 350 | if ( $idRede ) |