From 3fe7db0a35cc3dfcaeee435bb3036f53726c0301 Mon Sep 17 00:00:00 2001 From: Ingo Schnabel Date: Sun, 17 May 2026 14:48:32 +0200 Subject: [PATCH] GoalMetric --- .../java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java b/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java index 35457ac..f31d0a0 100644 --- a/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java +++ b/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java @@ -77,7 +77,7 @@ public class GoalMetricPeriodTotalDAO extends AbstractDAO cb.equal(root.get(GoalMetricPeriodTotal_.athleteId), athleteId), cb.equal(root.get(GoalMetricPeriodTotal_.metric), metric), cb.equal(root.get(GoalMetricPeriodTotal_.isoWeekYear), isoWeekYear), - cb.equal(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek), + cb.lessThanOrEqualTo(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek), cb.equal(root.get(GoalMetricPeriodTotal_.year), year), cb.equal(root.get(GoalMetricPeriodTotal_.month), month) ); @@ -98,7 +98,7 @@ public class GoalMetricPeriodTotalDAO extends AbstractDAO cb.equal(root.get(GoalMetricPeriodTotal_.athleteId), athleteId), cb.equal(root.get(GoalMetricPeriodTotal_.metric), metric), cb.equal(root.get(GoalMetricPeriodTotal_.isoWeekYear), isoWeekYear), - cb.equal(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek), + cb.lessThanOrEqualTo(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek), cb.equal(root.get(GoalMetricPeriodTotal_.year), year) ); final Double result = em.createQuery(cq).getSingleResult();