Skip to content

S
simple_controller
Commit 2c5b34f3 by liyijie
Options

fix: 使用include_sum

parent cccf92f3
Showing with 2 additions and 2 deletions
lib/simple_controller/base_controller.rb
...@@ -247,7 +247,7 @@ class SimpleController::BaseController < ::InheritedResources::Base ...@@ -247,7 +247,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, enum_dics: params[:enum_dics]&.to_unsafe_h || {}).group_sum(*params[:group_keys], include_count: true) @statistics = Com::CounterStorage.load(params[:group_keys], hash, enum_dics: params[:enum_dics]&.to_unsafe_h || {}).group_sum(*params[:group_keys], include_sum: true)
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
...@@ -311,7 +311,7 @@ class SimpleController::BaseController < ::InheritedResources::Base ...@@ -311,7 +311,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, enum_dics: params[:enum_dics]&.to_unsafe_h || {}).group_sum(*params[:group_keys], include_count: true) @statistics = Com::CounterStorage.load(params[:group_keys], hash, enum_dics: params[:enum_dics]&.to_unsafe_h || {}).group_sum(*params[:group_keys], include_sum: true)
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