добавлена страница калькулятора
This commit is contained in:
@@ -29,13 +29,11 @@ import ru.kayashov.bar.repository.ReceiptRepository;
|
|||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
import javax.persistence.criteria.CriteriaBuilder;
|
import javax.persistence.criteria.CriteriaBuilder;
|
||||||
import javax.persistence.criteria.CriteriaQuery;
|
import javax.persistence.criteria.CriteriaQuery;
|
||||||
import javax.persistence.criteria.Expression;
|
|
||||||
import javax.persistence.criteria.Join;
|
import javax.persistence.criteria.Join;
|
||||||
import javax.persistence.criteria.JoinType;
|
import javax.persistence.criteria.JoinType;
|
||||||
import javax.persistence.criteria.Order;
|
import javax.persistence.criteria.Order;
|
||||||
import javax.persistence.criteria.Predicate;
|
import javax.persistence.criteria.Predicate;
|
||||||
import javax.persistence.criteria.Root;
|
import javax.persistence.criteria.Root;
|
||||||
import javax.persistence.criteria.Subquery;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -80,7 +78,7 @@ public class CocktailService {
|
|||||||
dto.setOnlyFavourite(false);
|
dto.setOnlyFavourite(false);
|
||||||
dto.setSort(SortingEnum.NAME_ASC);
|
dto.setSort(SortingEnum.NAME_ASC);
|
||||||
|
|
||||||
return mapper.cocktailsToDtoList(criteria(dto),false, true);
|
return mapper.cocktailsToDtoList(criteria(dto), false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<CocktailEntity> criteria(CocktailFilterRequestDto dto) {
|
private List<CocktailEntity> criteria(CocktailFilterRequestDto dto) {
|
||||||
|
|||||||
Reference in New Issue
Block a user