|
@@ -81,20 +81,20 @@ public class SubjectiveScoreServiceImpl extends BaseQueryService<SubjectiveScore
|
|
|
// predicates.add(predicate);
|
|
|
// }
|
|
|
if (query.getMainStartScore() != null) {
|
|
|
- Predicate predicate = cb
|
|
|
- .greaterThan(root.get("mainScore").as(Double.class), query.getMainStartScore());
|
|
|
+ Predicate predicate = cb.greaterThanOrEqualTo(root.get("mainScore").as(Double.class),
|
|
|
+ query.getMainStartScore());
|
|
|
predicates.add(predicate);
|
|
|
}
|
|
|
if (query.getMainEndScore() != null) {
|
|
|
- Predicate predicate = cb.lessThan(root.get("mainScore").as(Double.class), query.getMainEndScore());
|
|
|
+ Predicate predicate = cb.lessThanOrEqualTo(root.get("mainScore").as(Double.class),
|
|
|
+ query.getMainEndScore());
|
|
|
predicates.add(predicate);
|
|
|
}
|
|
|
if (query.getScore() != null) {
|
|
|
predicates.add(cb.equal(root.get("score"), query.getScore()));
|
|
|
}
|
|
|
- return predicates.isEmpty() ?
|
|
|
- cb.conjunction() :
|
|
|
- cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
|
+ return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
|
|
|
+ .size()]));
|
|
|
}
|
|
|
};
|
|
|
}
|