* Merge commit 07963e065b, use lastest code.

2023-11-10 14:00:56 +08:00
parent 4c9c2ff043
commit 482ada0934
1 changed files with 9 additions and 1 deletions
@@ -1607,7 +1607,15 @@ class pivotModel extends model
                }
                else
                {
-                    $columnSQL = "$stat(tt.`$field`) as `$uuName`";
+                    if($fields[$field]['type'] != 'number' and in_array($stat, array('avg', 'sum')))
+                    {
+                        $convertSql = $this->config->db->driver == 'mysql' ? "CAST(tt.`$field` AS DECIMAL(32, 2))" : "TO_DECIMAL(tt.`$field`)";
+                        $columnSQL  = "$stat($convertSql) as `$uuName`";
+                    }
+                    else
+                    {
+                        $columnSQL = "$stat(tt.`$field`) as `$uuName`";
+                    }
                }

                if($slice != 'noSlice') $columnSQL = "select $groupList,`$slice`,$columnSQL from ($sql) tt" . $connectSQL . $groupSQL . ",tt.`$slice`" . $orderSQL . ",tt.`$slice`";