AOKB/onboard
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Корректировка расчета плана за текущий месяц #3

Browse Source
This commit is contained in:
brusnitsyn
2026-06-06 00:30:22 +09:00
parent 6e0adc56fb
commit 8dda8ee5ac
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/MetricCalculators/PlanCalculator.php
View File

@@ -49,7 +49,7 @@ class PlanCalculator extends BaseMetricService implements MetricCalculatorInterf
->join('duty_report_metric_results as mr', 'r.id', '=', 'mr.rf_report_id') ->join('duty_report_metric_results as mr', 'r.id', '=', 'mr.rf_report_id')
->whereIn('r.rf_department_id', $departmentIds) ->whereIn('r.rf_department_id', $departmentIds)
->where('mr.rf_metrika_item_id', self::getMetricId()) ->where('mr.rf_metrika_item_id', self::getMetricId())
->where('r.period_end', '>=', $startCurrentMonth) // Используем >= ->where('r.period_end', '>', $startCurrentMonth) // Используем >=
->where('r.period_end', '<=', $endDate) ->where('r.period_end', '<=', $endDate)
->select('r.rf_department_id', DB::raw('SUM(CAST(mr.value AS DECIMAL)) as total')) ->select('r.rf_department_id', DB::raw('SUM(CAST(mr.value AS DECIMAL)) as total'))
->groupBy('r.rf_department_id') ->groupBy('r.rf_department_id')