|
|
@@ -841,7 +841,7 @@ class BonusController extends BaseController {
|
|
|
}
|
|
|
$data = $this->_periodBonus($periodNum,false);
|
|
|
if( isset($data['filterTypes']) && is_array($data['filterTypes']) ) {
|
|
|
- $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> '结算期数']], $data['filterTypes']);
|
|
|
+ $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> 'Number of settlement periods']], $data['filterTypes']);
|
|
|
}
|
|
|
|
|
|
return static::notice($data);
|
|
|
@@ -929,7 +929,7 @@ class BonusController extends BaseController {
|
|
|
*/
|
|
|
private function _periodBonus($periodNum,$periodFilter = true) {
|
|
|
$filter = $this->filterCondition([
|
|
|
- 'periodNum' => 'CB.PERIOD_NUM',
|
|
|
+ 'PERIOD_NUM' => 'CB.PERIOD_NUM',
|
|
|
'LAST_USER_NAME' => 'CB.LAST_USER_NAME',
|
|
|
'LAST_REAL_NAME' => 'CB.LAST_REAL_NAME',
|
|
|
'LAST_DEC_LV_NAME' => 'CB.LAST_DEC_LV',
|