|
|
@@ -130,11 +130,11 @@ class BonusController extends BaseController {
|
|
|
$user[0] = [
|
|
|
'number' => $userInfo['USER_NAME'],
|
|
|
'name' => $userInfo['REAL_NAME'],
|
|
|
- 'perf_status' => '0', // 0 未达标 1为已达标
|
|
|
- 'perf_status_name' => '不达标',
|
|
|
'user_perf' => 0, // 个人业绩
|
|
|
'team_perf' => 0, // 团队新增累计业绩
|
|
|
- 'total_perf' => 0 // 合计业绩
|
|
|
+ 'total_perf' => 0, // 合计业绩
|
|
|
+ 'perf_status' => '0', // 0 未达标 1为已达标
|
|
|
+ 'perf_status_name' => 'Fail',
|
|
|
];
|
|
|
if (!empty($data)) {
|
|
|
$userCheck = PerfMonth::checkStatus($data['PV_PCS']+$data['PV_PSS']);
|
|
|
@@ -142,7 +142,7 @@ class BonusController extends BaseController {
|
|
|
$user[0]['team_perf'] = $data['PV_PSS'];
|
|
|
$user[0]['total_perf'] = $data['PV_PCS']+$data['PV_PSS'];
|
|
|
$user[0]['perf_status'] = $userCheck ? '1' : $user[0]['perf_status'];
|
|
|
- $user[0]['perf_status_name'] = $userCheck ? '达标' : $user[0]['perf_status_name'];
|
|
|
+ $user[0]['perf_status_name'] = $userCheck ? 'Pass' : $user[0]['perf_status_name'];
|
|
|
}
|
|
|
$teamInfo = [];
|
|
|
$calcAt = PerfMonth::find()->select(['CREATED_AT'])->where('CALC_MONTH=:CALC_MONTH', ['CALC_MONTH'=>$month])->asArray()->one();
|
|
|
@@ -167,13 +167,13 @@ class BonusController extends BaseController {
|
|
|
$teamInfo[]['perf_status'] = $relationCheck ? '1' : '0';
|
|
|
if ($relationCheck) {
|
|
|
$userStatusFlag = true; // 只要有一个达标,则个人就达标
|
|
|
- $teamInfo[$k]['number'] = '';
|
|
|
- $teamInfo[$k]['name'] = '';
|
|
|
- $teamInfo[$k]['user_perf'] = '';
|
|
|
- $teamInfo[$k]['team_perf'] = '';
|
|
|
- $teamInfo[$k]['total_perf'] = '';
|
|
|
+ $teamInfo[$k]['number'] = $v['USER_NAME'];
|
|
|
+ $teamInfo[$k]['name'] = $v['REAL_NAME'];
|
|
|
+ $teamInfo[$k]['user_perf'] = $relationPerf['PV_PCS'];
|
|
|
+ $teamInfo[$k]['team_perf'] = $relationPerf['PV_PSS'];
|
|
|
+ $teamInfo[$k]['total_perf'] = $relationPerf['PV_PCS']+$relationPerf['PV_PSS'];
|
|
|
$teamInfo[$k]['perf_status'] = '1';
|
|
|
- $teamInfo[$k]['perf_status_name'] = '达标';
|
|
|
+ $teamInfo[$k]['perf_status_name'] = 'Pass';
|
|
|
} else {
|
|
|
$teamInfo[$k]['number'] = $v['USER_NAME'];
|
|
|
$teamInfo[$k]['name'] = $v['REAL_NAME'];
|
|
|
@@ -181,7 +181,7 @@ class BonusController extends BaseController {
|
|
|
$teamInfo[$k]['team_perf'] = $relationPerf['PV_PSS'];
|
|
|
$teamInfo[$k]['total_perf'] = $relationPerf['PV_PCS']+$relationPerf['PV_PSS'];
|
|
|
$teamInfo[$k]['perf_status'] = '0';
|
|
|
- $teamInfo[$k]['perf_status_name'] = '不达标';
|
|
|
+ $teamInfo[$k]['perf_status_name'] = 'Fail';
|
|
|
}
|
|
|
}
|
|
|
}
|