|
@@ -536,8 +536,8 @@ class BonusSend extends BaseObject {
|
|
|
->where(
|
|
->where(
|
|
|
'CALC_MONTH=:CALC_MONTH AND PERIOD_NUM=:PERIOD_NUM',
|
|
'CALC_MONTH=:CALC_MONTH AND PERIOD_NUM=:PERIOD_NUM',
|
|
|
[
|
|
[
|
|
|
- ':CALC_MONTH' => 202204,
|
|
|
|
|
- ':PERIOD_NUM' => 107
|
|
|
|
|
|
|
+ ':CALC_MONTH' => $this->_calcYearMonth,
|
|
|
|
|
+ ':PERIOD_NUM' =>$this->_periodNum
|
|
|
]
|
|
]
|
|
|
)
|
|
)
|
|
|
->orderBy('CREATED_AT DESC')
|
|
->orderBy('CREATED_AT DESC')
|
|
@@ -551,13 +551,12 @@ class BonusSend extends BaseObject {
|
|
|
$transaction = Yii::$app->db->beginTransaction();
|
|
$transaction = Yii::$app->db->beginTransaction();
|
|
|
try {
|
|
try {
|
|
|
foreach ($allData as $data) {
|
|
foreach ($allData as $data) {
|
|
|
- LoggerTool::info([$data['USER_ID'], $data['LEVEL_ID']]);
|
|
|
|
|
// 蓝星奖计算的最新聘级
|
|
// 蓝星奖计算的最新聘级
|
|
|
$latestEmpLv = $data['LEVEL_ID']; // 本期计算最新管理级别
|
|
$latestEmpLv = $data['LEVEL_ID']; // 本期计算最新管理级别
|
|
|
$latestEmpLvSort = $empLv[$latestEmpLv]; // 当前蓝星计算的聘级 级别值
|
|
$latestEmpLvSort = $empLv[$latestEmpLv]; // 当前蓝星计算的聘级 级别值
|
|
|
-// if ($defaultEmpLv == $latestEmpLv) {
|
|
|
|
|
-// continue;
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if ($defaultEmpLv == $latestEmpLv) {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
// 用户存储的最高聘级
|
|
// 用户存储的最高聘级
|
|
|
$user = CalcCache::getUserInfo($data['USER_ID'], $this->_periodNum);
|
|
$user = CalcCache::getUserInfo($data['USER_ID'], $this->_periodNum);
|
|
|
$highestEmpLv = $user['EMP_LV']; // 用户的历史最高聘级
|
|
$highestEmpLv = $user['EMP_LV']; // 用户的历史最高聘级
|