空数据时统计数也返回

app/Http/Controllers/Behavior/CommentRecordController.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace App\Http\Controllers\Behavior;
+
 use App\Http\Controllers\Controller;
 use App\Models\CommentRecord;
 use App\Repositories\Behavior\CommentRecordRepository;
@@ -8,13 +10,13 @@ use Illuminate\Http\Request;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection;
+
 /**
  * Created by PhpStorm.
  * User: durong
  * Date: 2019/6/14
  * Time: 下午6:06
  */
-
 class CommentRecordController extends Controller
 {
     public function __construct(CommentRecordRepository $commentRecordRepository)
@@ -29,18 +31,12 @@ 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');//总发放彩虹豆
-        }
+        $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');//总发放彩虹豆
+
         $fractal = new Manager();
         $resource = new Collection($commentList, new CommentRecordTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($commentList));

app/Http/Controllers/Behavior/GeneralRecordController.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace App\Http\Controllers\Behavior;
+
 use App\Http\Controllers\Controller;
 use App\Models\GeneralRecord;
 use App\Models\ReleaseRecord;
@@ -11,13 +13,13 @@ use Illuminate\Http\Request;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection;
+
 /**
  * Created by PhpStorm.
  * User: durong
  * Date: 2019/6/14
  * Time: 下午8:40
  */
-
 class GeneralRecordController extends Controller
 {
     public function __construct(GenaralRecordRepository $genaralRecordRepository)
@@ -32,18 +34,12 @@ class GeneralRecordController extends Controller
     {
         $genaralList = $this->genaralRecordRepository->lists($request->all());
 
-        $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');//总发放彩虹豆
-        }
+        $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');//总发放彩虹豆
+
         $fractal = new Manager();
         $resource = new Collection($genaralList, new GeneralRecordTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($genaralList));

app/Http/Controllers/Behavior/RegisteredRecordController.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace App\Http\Controllers\Behavior;
+
 use App\Http\Controllers\Controller;
 use App\Models\RegisteredRecord;
 use App\Repositories\Behavior\RegisteredRecordRepository;
@@ -8,13 +10,13 @@ use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection;
 use Illuminate\Http\Request;
+
 /**
  * Created by PhpStorm.
  * User: durong
  * Date: 2019/6/14
  * Time: 上午11:30
  */
-
 class RegisteredRecordController extends Controller
 {
     public function __construct(RegisteredRecordRepository $registeredRecordRepository)
@@ -29,27 +31,20 @@ 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();//总触发数
-            $behavior_effective_trigger = RegisteredRecord::select('trigger_type')->where('trigger_type', 1)->count();//有效触发数
-            $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');//总发放彩虹豆
-        }
+        $behavior_absolute_progression = RegisteredRecord::select('absolute_progression')->orderBy('id', 'DESC')->first();//行为绝对级数
+        $behavior_trigger_times = RegisteredRecord::select('trigger_type')->where('trigger_type', '!=', null)->count();//总触发数
+        $behavior_effective_trigger = RegisteredRecord::select('trigger_type')->where('trigger_type', 1)->count();//有效触发数
+        $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');//总发放彩虹豆
+
         $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_absolute_progression' => $behavior_absolute_progression->absolute_progression ?? 0,
                 'all_trigger_times' => $behavior_trigger_times,
                 'all_effective_trigger' => $behavior_effective_trigger,
                 'physical_exertion' => intval($physical_exertion),

app/Http/Controllers/Behavior/ReleaseRecordController.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace App\Http\Controllers\Behavior;
+
 use App\Http\Controllers\Controller;
 use App\Models\ReleaseRecord;
 use App\Repositories\Behavior\ReleaseRecordRepository;
@@ -8,13 +10,13 @@ use Illuminate\Http\Request;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection;
+
 /**
  * Created by PhpStorm.
  * User: durong
  * Date: 2019/6/14
  * Time: 下午8:17
  */
-
 class ReleaseRecordController extends Controller
 {
     public function __construct(ReleaseRecordRepository $releaseRecordRepository)
@@ -29,18 +31,12 @@ 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');//总发放彩虹豆
-        }
+        $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');//总发放彩虹豆
+
         $fractal = new Manager();
         $resource = new Collection($releaseList, new ReleaseRecordTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($releaseList));