* [bug#58662,done,0.2h] fix contribution count in annual report.

2024-12-26 14:16:26 +08:00
parent 7914de64cb
commit e07cd0a838
1 changed files with 10 additions and 2 deletions
@@ -269,11 +269,19 @@ class reportModel extends model
     */
    public function getUserYearContributionCount(array $accounts, string $year): int
    {
-        return $this->dao->select('count(1) as count')->from(TABLE_ACTION)
+        $stmt = $this->dao->select('id,objectType,action')->from(TABLE_ACTION)
            ->where('LEFT(date, 4)')->eq($year)
            ->andWhere('objectType')->in(array_keys($this->config->report->annualData['contributionCount']))
            ->beginIF($accounts)->andWhere('actor')->in($accounts)->fi()
-            ->fetch('count');
+            ->query();
+
+        $count = 0;
+        while($action = $stmt->fetch())
+        {
+            if(isset($this->config->report->annualData['contributionCount'][$action->objectType][strtolower($action->action)])) $count ++;
+        }
+
+        return $count;
    }

    /**