Browse Source

统计数据写在额外里

durong 5 years ago
parent
commit
b9f99654ad

+ 12 - 7
app/Http/Controllers/Behavior/CommentRecordController.php

@@ -29,25 +29,30 @@ class CommentRecordController extends Controller
     {
         $commentList = $this->commentRecordRepository->lists($request->all());
 
+        $behavior_trigger_times = 0;
+        $behavior_effective_trigger = 0;
+        $physical_exertion = 0;
+        $generation_quantity = 0;
+        $quantity_issued = 0;
         if (count($commentList)>0) {
             $behavior_trigger_times = CommentRecord::select('trigger_type')->where('trigger_type', '!=', null)->count();//总触发数
             $behavior_effective_trigger = CommentRecord::select('trigger_type')->where('trigger_type', 1)->count();//有效触发数
             $physical_exertion = CommentRecord::select('physical_exertion')->sum('physical_exertion');//总消耗体力值
             $generation_quantity = CommentRecord::select('generation_quantity')->sum('generation_quantity');//总生成彩虹豆
             $quantity_issued = CommentRecord::select('quantity_issued')->sum('quantity_issued');//总发放彩虹豆
-            foreach ($commentList as $k => $v) {
-                $v['all_trigger_times'] = $behavior_trigger_times;
-                $v['all_effective_trigger'] = $behavior_effective_trigger;
-                $v['physical_exertion'] = intval($physical_exertion);
-                $v['generation_quantity'] = intval($generation_quantity);
-                $v['quantity_issued'] = intval($quantity_issued);
-            }
         }
         $fractal = new Manager();
         $resource = new Collection($commentList, new CommentRecordTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($commentList));
         $data = $fractal->createData($resource)->toArray();
         $data['extra'] = [
+            'statistics' => [
+                'all_trigger_times' => $behavior_trigger_times,
+                'all_effective_trigger' => $behavior_effective_trigger,
+                'physical_exertion' => intval($physical_exertion),
+                'generation_quantity' => intval($generation_quantity),
+                'quantity_issued' => intval($quantity_issued)
+            ],
             'filters' => [
                 'id',
                 'uid',

+ 14 - 14
app/Http/Controllers/Behavior/GeneralRecordController.php

@@ -32,25 +32,30 @@ class GeneralRecordController extends Controller
     {
         $genaralList = $this->genaralRecordRepository->lists($request->all());
 
-        if (count($genaralList)>0) {
+        $behavior_trigger_times = 0;
+        $behavior_effective_trigger = 0;
+        $physical_exertion = 0;
+        $generation_quantity = 0;
+        $quantity_issued = 0;
+        if (count($genaralList) > 0) {
             $behavior_trigger_times = GeneralRecord::select('trigger_type')->where('trigger_type', '!=', null)->count();//总触发数
             $behavior_effective_trigger = GeneralRecord::select('trigger_type')->where('trigger_type', 1)->count();//有效触发数
             $physical_exertion = GeneralRecord::select('physical_exertion')->sum('physical_exertion');//总消耗体力值
             $generation_quantity = GeneralRecord::select('generation_quantity')->sum('generation_quantity');//总生成彩虹豆
             $quantity_issued = GeneralRecord::select('quantity_issued')->sum('quantity_issued');//总发放彩虹豆
-            foreach ($genaralList as $k => $v) {
-                $v['all_trigger_times'] = $behavior_trigger_times;
-                $v['all_effective_trigger'] = $behavior_effective_trigger;
-                $v['physical_exertion'] = intval($physical_exertion);
-                $v['generation_quantity'] = intval($generation_quantity);
-                $v['quantity_issued'] = intval($quantity_issued);
-            }
         }
         $fractal = new Manager();
         $resource = new Collection($genaralList, new GeneralRecordTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($genaralList));
         $data = $fractal->createData($resource)->toArray();
         $data['extra'] = [
+            'statistics' => [
+                'all_trigger_times' => $behavior_trigger_times,
+                'all_effective_trigger' => $behavior_effective_trigger,
+                'physical_exertion' => intval($physical_exertion),
+                'generation_quantity' => intval($generation_quantity),
+                'quantity_issued' => intval($quantity_issued)
+            ],
             'filters' => [
                 'id',
                 'uid',
@@ -79,12 +84,7 @@ class GeneralRecordController extends Controller
                 'name',
                 'relative_series',
                 'is_open',
-                'bahavior_created_at',
-                'all_trigger_times',
-                'all_effective_trigger',
-                'all_physical_exertion',
-                'all_generation_quantity',
-                'all_quantity_issued'
+                'bahavior_created_at'
             ]
         ];
         return $data;

+ 15 - 15
app/Http/Controllers/Behavior/RegisteredRecordController.php

@@ -29,6 +29,12 @@ class RegisteredRecordController extends Controller
     {
         $registeredList = $this->registeredRecordRepository->lists($request->all());
 
+        $behavior_absolute_progression = 0;
+        $behavior_trigger_times = 0;
+        $behavior_effective_trigger = 0;
+        $physical_exertion = 0;
+        $generation_quantity = 0;
+        $quantity_issued = 0;
         if (count($registeredList)>0) {
             $behavior_absolute_progression = RegisteredRecord::select('absolute_progression')->orderBy('id', 'DESC')->first();//行为绝对级数
             $behavior_trigger_times = RegisteredRecord::select('trigger_type')->where('trigger_type', '!=', null)->count();//总触发数
@@ -36,20 +42,20 @@ class RegisteredRecordController extends Controller
             $physical_exertion = RegisteredRecord::select('physical_exertion')->sum('physical_exertion');//总消耗体力值
             $generation_quantity = RegisteredRecord::select('generation_quantity')->sum('generation_quantity');//总生成彩虹豆
             $quantity_issued = RegisteredRecord::select('quantity_issued')->sum('quantity_issued');//总发放彩虹豆
-            foreach ($registeredList as $k => $v) {
-                $v['all_absolute_progression'] = $behavior_absolute_progression->absolute_progression;
-                $v['all_trigger_times'] = $behavior_trigger_times;
-                $v['all_effective_trigger'] = $behavior_effective_trigger;
-                $v['physical_exertion'] = intval($physical_exertion);
-                $v['generation_quantity'] = intval($generation_quantity);
-                $v['quantity_issued'] = intval($quantity_issued);
-            }
         }
         $fractal = new Manager();
         $resource = new Collection($registeredList, new RegisteredRecordTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($registeredList));
         $data = $fractal->createData($resource)->toArray();
         $data['extra'] = [
+            'statistics' => [
+                'all_absolute_progression' => $behavior_absolute_progression->absolute_progression,
+                'all_trigger_times' => $behavior_trigger_times,
+                'all_effective_trigger' => $behavior_effective_trigger,
+                'physical_exertion' => intval($physical_exertion),
+                'generation_quantity' => intval($generation_quantity),
+                'quantity_issued' => intval($quantity_issued)
+            ],
             'filters' => [
                 'id',
                 'uid',
@@ -76,13 +82,7 @@ class RegisteredRecordController extends Controller
                 'name',
                 'relative_series',
                 'is_open',
-                'bahavior_created_at',
-                'all_absolute_progression',
-                'all_trigger_times',
-                'all_effective_trigger',
-                'all_physical_exertion',
-                'all_generation_quantity',
-                'all_quantity_issued'
+                'bahavior_created_at'
             ]
         ];
         return $data;

+ 13 - 13
app/Http/Controllers/Behavior/ReleaseRecordController.php

@@ -29,25 +29,30 @@ class ReleaseRecordController extends Controller
     {
         $releaseList = $this->releaseRecordRepository->lists($request->all());
 
+        $behavior_trigger_times = 0;
+        $behavior_effective_trigger = 0;
+        $physical_exertion = 0;
+        $generation_quantity = 0;
+        $quantity_issued = 0;
         if (count($releaseList)>0) {
             $behavior_trigger_times = ReleaseRecord::select('trigger_type')->where('trigger_type', '!=', null)->count();//总触发数
             $behavior_effective_trigger = ReleaseRecord::select('trigger_type')->where('trigger_type', 1)->count();//有效触发数
             $physical_exertion = ReleaseRecord::select('physical_exertion')->sum('physical_exertion');//总消耗体力值
             $generation_quantity = ReleaseRecord::select('generation_quantity')->sum('generation_quantity');//总生成彩虹豆
             $quantity_issued = ReleaseRecord::select('quantity_issued')->sum('quantity_issued');//总发放彩虹豆
-            foreach ($releaseList as $k => $v) {
-                $v['all_trigger_times'] = $behavior_trigger_times;
-                $v['all_effective_trigger'] = $behavior_effective_trigger;
-                $v['physical_exertion'] = intval($physical_exertion);
-                $v['generation_quantity'] = intval($generation_quantity);
-                $v['quantity_issued'] = intval($quantity_issued);
-            }
         }
         $fractal = new Manager();
         $resource = new Collection($releaseList, new ReleaseRecordTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($releaseList));
         $data = $fractal->createData($resource)->toArray();
         $data['extra'] = [
+            'statistics' => [
+                'all_trigger_times' => $behavior_trigger_times,
+                'all_effective_trigger' => $behavior_effective_trigger,
+                'physical_exertion' => intval($physical_exertion),
+                'generation_quantity' => intval($generation_quantity),
+                'quantity_issued' => intval($quantity_issued)
+            ],
             'filters' => [
                 'id',
                 'uid',
@@ -73,12 +78,7 @@ class ReleaseRecordController extends Controller
                 'name',
                 'relative_series',
                 'is_open',
-                'bahavior_created_at',
-                'all_trigger_times',
-                'all_effective_trigger',
-                'all_physical_exertion',
-                'all_generation_quantity',
-                'all_quantity_issued'
+                'bahavior_created_at'
             ]
         ];
         return $data;

+ 0 - 5
app/Transformers/Behavior/CommentRecordTransformer.php

@@ -35,11 +35,6 @@ class CommentRecordTransformer extends TransformerAbstract
             'relative_series' => $commentList->Behavior->relative_series,
             'is_open' => $commentList->Behavior->is_open,
             'bahavior_created_at' => date($commentList->Behavior->created_at),
-            'all_trigger_times' => $commentList['all_trigger_times'],//总触发数
-            'all_effective_trigger' => $commentList['all_effective_trigger'],//有效触发数
-            'all_physical_exertion' => $commentList['physical_exertion'],//总消耗体力值
-            'all_generation_quantity' => $commentList['generation_quantity'],//总生成彩虹豆
-            'all_quantity_issued' => $commentList['quantity_issued'],//总发放彩虹豆
         ];
     }
 }

+ 3 - 8
app/Transformers/Behavior/GeneralRecordTransformer.php

@@ -24,9 +24,9 @@ class GeneralRecordTransformer extends TransformerAbstract
             'related_content_id' => $genaralList['related_content_id'],
             'content_author_id' => $genaralList['content_author_id'],
             'physical_exertion' => $genaralList['physical_exertion'],
-            'trigger_type' => $genaralList['trigger_type'],
-            'generation_type' => $genaralList['generation_type'],
-            'release_status' => $genaralList['release_status'],
+            'trigger_type' => intval($genaralList['trigger_type']),
+            'generation_type' => intval($genaralList['generation_type']),
+            'release_status' => intval($genaralList['release_status']),
             'generation_quantity' => $genaralList['generation_quantity'],
             'quantity_issued' => $genaralList['quantity_issued'],
             'behavior_cycle_type' => $genaralList->Behavior->behavior_cycle_type,
@@ -34,11 +34,6 @@ class GeneralRecordTransformer extends TransformerAbstract
             'relative_series' => $genaralList->Behavior->relative_series,
             'is_open' => $genaralList->Behavior->is_open,
             'bahavior_created_at' => date($genaralList->Behavior->created_at),
-            'all_trigger_times' => $genaralList['all_trigger_times'],//总触发数
-            'all_effective_trigger' => $genaralList['all_effective_trigger'],//有效触发数
-            'all_physical_exertion' => $genaralList['physical_exertion'],//总消耗体力值
-            'all_generation_quantity' => $genaralList['generation_quantity'],//总生成彩虹豆
-            'all_quantity_issued' => $genaralList['quantity_issued'],//总发放彩虹豆
         ];
     }
 }

+ 0 - 6
app/Transformers/Behavior/RegisteredRecordTransformer.php

@@ -31,12 +31,6 @@ class RegisteredRecordTransformer extends TransformerAbstract
             'relative_series' => $registeredList->Behavior->relative_series,
             'is_open' => $registeredList->Behavior->is_open,
             'bahavior_created_at' => date($registeredList->Behavior->created_at),
-            'all_absolute_progression' => $registeredList['all_absolute_progression'],//行为绝对级数
-            'all_trigger_times' => $registeredList['all_trigger_times'],//总触发数
-            'all_effective_trigger' => $registeredList['all_effective_trigger'],//有效触发数
-            'all_physical_exertion' => $registeredList['physical_exertion'],//总消耗体力值
-            'all_generation_quantity' => $registeredList['generation_quantity'],//总生成彩虹豆
-            'all_quantity_issued' => $registeredList['quantity_issued'],//总发放彩虹豆
         ];
     }
 }

+ 0 - 5
app/Transformers/Behavior/ReleaseRecordTransformer.php

@@ -32,11 +32,6 @@ class ReleaseRecordTransformer extends TransformerAbstract
             'relative_series' => $releaseRecord->Behavior->relative_series,
             'is_open' => $releaseRecord->Behavior->is_open,
             'bahavior_created_at' => date($releaseRecord->Behavior->created_at),
-            'all_trigger_times' => $releaseRecord['all_trigger_times'],//总触发数
-            'all_effective_trigger' => $releaseRecord['all_effective_trigger'],//有效触发数
-            'all_physical_exertion' => $releaseRecord['physical_exertion'],//总消耗体力值
-            'all_generation_quantity' => $releaseRecord['generation_quantity'],//总生成彩虹豆
-            'all_quantity_issued' => $releaseRecord['quantity_issued'],//总发放彩虹豆
         ];
     }
 }