|
@@ -3,6 +3,7 @@
|
|
namespace App\Http\Controllers\Behavior;
|
|
namespace App\Http\Controllers\Behavior;
|
|
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Controllers\Controller;
|
|
|
|
+use App\Models\Behavior;
|
|
use App\Models\RegisteredRecord;
|
|
use App\Models\RegisteredRecord;
|
|
use App\Repositories\Behavior\RegisteredRecordRepository;
|
|
use App\Repositories\Behavior\RegisteredRecordRepository;
|
|
use App\Transformers\Behavior\RegisteredRecordTransformer;
|
|
use App\Transformers\Behavior\RegisteredRecordTransformer;
|
|
@@ -31,7 +32,7 @@ class RegisteredRecordController extends Controller
|
|
{
|
|
{
|
|
$registeredList = $this->registeredRecordRepository->lists($request->all());
|
|
$registeredList = $this->registeredRecordRepository->lists($request->all());
|
|
|
|
|
|
- $behavior_absolute_progression = RegisteredRecord::select('absolute_progression')->orderBy('id', 'DESC')->first();//行为绝对级数
|
|
|
|
|
|
+ $behavior_absolute_progression = Behavior::select('absolute_progression')->where('behavior_identification', 'register')->first();//行为绝对级数
|
|
$behavior_trigger_times = RegisteredRecord::select('trigger_type')->where('trigger_type', '!=', null)->count();//总触发数
|
|
$behavior_trigger_times = RegisteredRecord::select('trigger_type')->where('trigger_type', '!=', null)->count();//总触发数
|
|
$behavior_effective_trigger = RegisteredRecord::select('trigger_type')->where('trigger_type', 1)->count();//有效触发数
|
|
$behavior_effective_trigger = RegisteredRecord::select('trigger_type')->where('trigger_type', 1)->count();//有效触发数
|
|
$physical_exertion = RegisteredRecord::select('physical_exertion')->sum('physical_exertion');//总消耗体力值
|
|
$physical_exertion = RegisteredRecord::select('physical_exertion')->sum('physical_exertion');//总消耗体力值
|