diff --git a/backend/src/main/java/persistance/services/AlmacenamientoDAO.java b/backend/src/main/java/persistance/services/AlmacenamientoDAO.java index cec36043420dbadca9ee37cf5606d6ba2d8bc9e0..c2811f7a880411eaf20f222641d37070d1e962c5 100644 --- a/backend/src/main/java/persistance/services/AlmacenamientoDAO.java +++ b/backend/src/main/java/persistance/services/AlmacenamientoDAO.java @@ -148,11 +148,11 @@ public class AlmacenamientoDAO implements IAlmacenamiento { @Override @Transactional public List<BienFront> getProductos() { - String jpql = "SELECT new models.BienFront(i.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad)) " + + String jpql = "SELECT b.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad) " + "FROM Ingrediente i " + "JOIN Bien b ON i.idBien = b.id " + "WHERE b.tipo = 1 " + - "GROUP BY b.id, b.nombre"; + "GROUP BY b.id, b.tipo, b.tipo, i.precioUnitario"; return entityManager.createQuery(jpql, BienFront.class).getResultList(); } @@ -160,11 +160,11 @@ public class AlmacenamientoDAO implements IAlmacenamiento { @Override @Transactional public List<BienFront> getInsumos() { - String jpql = "SELECT new models.BienFront(i.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad)) " + + String jpql = "SELECT b.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad) " + "FROM Ingrediente i " + "JOIN Bien b ON i.idBien = b.id " + "WHERE b.tipo = 0 " + - "GROUP BY b.id, b.nombre"; + "GROUP BY b.id, b.tipo, b.tipo, i.precioUnitario"; return entityManager.createQuery(jpql, BienFront.class).getResultList(); } @@ -178,9 +178,7 @@ public class AlmacenamientoDAO implements IAlmacenamiento { "WHERE b.tipo = 2 " + "GROUP BY b.id, b.tipo, b.tipo, i.precioUnitario"; - List<Object[]> retrieved = entityManager.createQuery(jpql, Object[].class).getResultList(); - System.out.print(retrieved.toString()); - return new ArrayList<BienFront>(); + return entityManager.createQuery(jpql, BienFront.class).getResultList(); } }