apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61 from q6q9/API_reports

Browse Source 
Api reports
This commit is contained in:
kavalar
2021-09-14 13:49:45 +03:00
committed by GitHub
parent 3737e741b9 85760914eb
commit 724a287a5e
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/modules/api/models/ReportSearchForm.php
View File

@ -39,13 +39,12 @@ class ReportSearchForm extends Model
{
$queryBuilder = Reports::find()
->with('task')
->andWhere(['between', 'reports.created_at', $this->fromDate, $this->toDate, $this->user_id])
->andWhere(['between', 'reports.created_at', $this->fromDate, $this->toDate])
->limit($this->limit)
->offset($this->offset);
if(isset($this->user_id)) {
$userCardId = UserCard::findByUserId($this->user_id)->id;
$queryBuilder->andWhere(['user_card_id' => $userCardId]);
$queryBuilder->andWhere(['user_card_id' => $this->user_id]);
}
$data = $queryBuilder->asArray()->all();