Commit 8b2a3b7c864e0cf5e0d0d51659720bacda93d474
1 parent
3cc425e0
Exists in
master
and in
1 other branch
Correção de Relatórios
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
src/Cacic/CommonBundle/Entity/SoftwareRepository.php
| ... | ... | @@ -97,14 +97,14 @@ class SoftwareRepository extends EntityRepository |
| 97 | 97 | { |
| 98 | 98 | // Monta a Consulta básica... |
| 99 | 99 | $qb = $this->createQueryBuilder('sw') |
| 100 | - ->select('COALESCE(sw.nmSoftware, prop.displayName) as nmSoftware', 'l.nmLocal','COUNT(DISTINCT col.computador) AS numComp') | |
| 100 | + ->select('COALESCE(sw.nmSoftware) as nmSoftware', 'l.nmLocal','COUNT(DISTINCT col.computador) AS numComp') | |
| 101 | 101 | ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software') |
| 102 | 102 | ->innerJoin('CacicCommonBundle:ClassProperty', 'class','WITH', 'prop.classProperty = class.idClassProperty') |
| 103 | 103 | ->innerJoin('CacicCommonBundle:ComputadorColeta', 'col', 'WITH', 'col.computador = prop.computador') |
| 104 | 104 | ->innerJoin('CacicCommonBundle:Computador', 'comp', 'WITH', 'col.computador = comp.idComputador') |
| 105 | 105 | ->innerJoin('comp.idRede','r') |
| 106 | 106 | ->leftJoin('r.idLocal', 'l') |
| 107 | - ->groupBy('sw.nmSoftware, prop.displayName, l.nmLocal') | |
| 107 | + ->groupBy('sw.nmSoftware, l.nmLocal') | |
| 108 | 108 | ->orderBy('sw.nmSoftware, l.nmLocal'); |
| 109 | 109 | |
| 110 | 110 | /** | ... | ... |