|
@@ -84,6 +84,12 @@ public class ManageServiceImpl implements ManageService {
|
|
|
if(Objects.nonNull(manageVO.getEndTime())){
|
|
|
predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get("happenTime"), manageVO.getEndTime()));
|
|
|
}
|
|
|
+ if(Objects.nonNull(manageVO.getMinAmount())){
|
|
|
+ predicates.add(criteriaBuilder.ge(root.get("amount"), manageVO.getMinAmount()));
|
|
|
+ }
|
|
|
+ if(Objects.nonNull(manageVO.getMaxAmount())){
|
|
|
+ predicates.add(criteriaBuilder.le(root.get("amount"), manageVO.getMaxAmount()));
|
|
|
+ }
|
|
|
if(manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0){
|
|
|
List<Predicate> list = new ArrayList<>();
|
|
|
if (manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0) {
|