Commit 58623d60 by liyijie

feat: statistics,使用counter_storage的group_sum

parent 9e8651ed
...@@ -188,7 +188,7 @@ class SimpleController::BaseController < ::InheritedResources::Base ...@@ -188,7 +188,7 @@ class SimpleController::BaseController < ::InheritedResources::Base
statistics_association = association.unscope(:order).distinct statistics_association = association.unscope(:order).distinct
if defined?(Com::CounterStorage) && Array(params[:group_keys]).count > 1 if defined?(Com::CounterStorage) && Array(params[:group_keys]).count > 1
hash = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count) hash = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
@statistics = Com::CounterStorage.load(params[:group_keys], hash, params[:enum_dics]&.to_unsafe_h || {}).group_count(*params[:group_keys]) @statistics = Com::CounterStorage.load(params[:group_keys], hash, params[:enum_dics]&.to_unsafe_h || {}).group_sum(*params[:group_keys])
else else
@statistics = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count) @statistics = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
end end
...@@ -243,7 +243,7 @@ class SimpleController::BaseController < ::InheritedResources::Base ...@@ -243,7 +243,7 @@ class SimpleController::BaseController < ::InheritedResources::Base
statistics_association = association.unscope(:order).distinct statistics_association = association.unscope(:order).distinct
if defined?(Com::CounterStorage) && Array(params[:group_keys]).count > 1 if defined?(Com::CounterStorage) && Array(params[:group_keys]).count > 1
hash = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count) hash = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
@statistics = Com::CounterStorage.load(params[:group_keys], hash, params[:enum_dics]&.to_unsafe_h || {}).group_count(*params[:group_keys]) @statistics = Com::CounterStorage.load(params[:group_keys], hash, params[:enum_dics]&.to_unsafe_h || {}).group_sum(*params[:group_keys])
else else
@statistics = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count) @statistics = statistics_association.group(params[:group_keys]).count.merge(count: statistics_association.count)
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment