diff --git a/frontend/controllers/StatisticsController.php b/frontend/controllers/StatisticsController.php
index 4c0cc65..d394593 100644
--- a/frontend/controllers/StatisticsController.php
+++ b/frontend/controllers/StatisticsController.php
@@ -506,9 +506,19 @@ class StatisticsController extends BaseController
public function actionWorkInfo() {
$request = Yii::$app->request;
$user_id = $request->get('user_id');
+ $date_begin = $request->get('date_begin');
+ $date_end = $request->get('date_end');
+ $date2_begin = $request->get('date2_begin');
+ $date2_end = $request->get('date2_end');
+ $username = $request->get('username');
return $this->render('work-info',[
- 'user_id' => $user_id
+ 'user_id' => $user_id,
+ 'date_begin' => $date_begin,
+ 'date_end' => $date_end,
+ 'date2_begin' => $date2_begin,
+ 'date2_end' => $date2_end,
+ 'username' => $username
]);
}
public function actionWorkInfoJson()
@@ -551,7 +561,7 @@ class StatisticsController extends BaseController
if($date2_end != '') {
$tmp_query = $tmp_query->andWhere('print_date<="'.$date2_end.'"');
}
- echo $tmp_query->createCommand()->rawSql."
";
+// echo $tmp_query->createCommand()->rawSql."
";
$items = $tmp_query->all();
foreach($items as $item) {
$total[0]++;
diff --git a/frontend/views/statistics/work-info.php b/frontend/views/statistics/work-info.php
index a2f754c..9cc29c9 100644
--- a/frontend/views/statistics/work-info.php
+++ b/frontend/views/statistics/work-info.php
@@ -65,6 +65,11 @@ use \common\libs\MyLib;
sidePagination: 'server',
queryParams: function(params) {
o['user_id'] = '=$user_id?>';
+ o['date_begin'] = '=$date_begin?>';
+ o['date_end'] = '=$date_end?>';
+ o['date2_begin'] = '=$date2_begin?>';
+ o['date2_end'] = '=$date2_end?>';
+ o['username'] = '=$username?>';
o['offset'] = params['offset'];
o['limit'] = params['limit'];
return o;