|
|
@@ -6,10 +6,12 @@ use common\helpers\Tool;
|
|
|
use common\helpers\user\Info;
|
|
|
use common\libs\dataList\DataListInterface;
|
|
|
use common\models\CalcBonus;
|
|
|
+use common\models\Countries;
|
|
|
use common\models\DeclarationLevel;
|
|
|
use common\models\EliteLevel;
|
|
|
use common\models\EmployLevel;
|
|
|
use common\models\Period;
|
|
|
+use common\models\User;
|
|
|
use common\models\UserInfo;
|
|
|
use Yii;
|
|
|
|
|
|
@@ -31,11 +33,13 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
|
|
|
{
|
|
|
$yearMonth = $this->others['yearMonth'];
|
|
|
$this->listData = CalcBonus::lists($this->condition, $this->params, [
|
|
|
- 'select'=>'CB.*,UI.CON_UID,UI.REC_UID,PO.CALC_YEAR,PO.CALC_MONTH',
|
|
|
+ 'select'=>'CB.*,UI.CON_UID,UI.REC_UID,PO.CALC_YEAR,PO.CALC_MONTH, C.NAME AS COUNTRY',
|
|
|
'from' => CalcBonus::tableName().' AS CB',
|
|
|
'join' => [
|
|
|
['INNER JOIN', UserInfo::tableName() . ' AS UI', 'CB.USER_ID=UI.USER_ID'],
|
|
|
['INNER JOIN', Period::tableName() . ' AS PO', 'PO.PERIOD_NUM=CB.PERIOD_NUM'],
|
|
|
+ ['INNER JOIN', User::tableName() . ' AS CU', 'UI.USER_ID=CU.ID'],
|
|
|
+ ['INNER JOIN', Countries::tableName() . ' AS C', 'CU.COUNTRY_ID=C.ID'],
|
|
|
],
|
|
|
'yearMonth' => $yearMonth,
|
|
|
'orderBy' => 'CB.CREATED_AT DESC, CB.ID DESC',
|