From c22fd67b32360f552f033e32fe2c9adaef24d9a9 Mon Sep 17 00:00:00 2001 From: songchenxuan <1097180981@qq.com> Date: Tue, 5 Sep 2023 16:25:43 +0800 Subject: [PATCH] * Fix sql error. --- module/metric/calc/system/hour/day_of_daily_effort.php | 2 +- module/metric/calc/system/hour/hour_of_daily_effort.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/metric/calc/system/hour/day_of_daily_effort.php b/module/metric/calc/system/hour/day_of_daily_effort.php index 6703a7805b..a58e459017 100644 --- a/module/metric/calc/system/hour/day_of_daily_effort.php +++ b/module/metric/calc/system/hour/day_of_daily_effort.php @@ -36,7 +36,7 @@ class day_of_daily_effort extends baseCalc ->from(TABLE_EFFORT) ->where('deleted')->eq('0') ->andWhere('year(date)')->ne('0000') - ->groupBy('`year`, `month`, `day`') + ->groupBy('`year`, `month`, `day`, date') ->query(); } diff --git a/module/metric/calc/system/hour/hour_of_daily_effort.php b/module/metric/calc/system/hour/hour_of_daily_effort.php index 89d43c75b1..35787254f4 100644 --- a/module/metric/calc/system/hour/hour_of_daily_effort.php +++ b/module/metric/calc/system/hour/hour_of_daily_effort.php @@ -30,7 +30,7 @@ class hour_of_daily_effort extends baseCalc ->from(TABLE_EFFORT) ->where('deleted')->eq('0') ->andWhere('year(date)')->ne('0000') - ->groupBy('`year`, `month`, `day`') + ->groupBy('`year`, `month`, `day`, date') ->query(); }