|
|
@@ -482,7 +482,11 @@ class PushBaseDataToCalc extends BaseBusiness
|
|
|
$currentPeriod = Period::getInfoByPeriodNum($periodNum);
|
|
|
//判断是否月节点
|
|
|
if ($currentPeriod['IS_MONTH']) {
|
|
|
- $periodNum = Period::getCurrentMonthPeriodByPeriodNum($periodNum);
|
|
|
+ if (in_array($periodNum, [3,6,9,12])){ // 如果是季度尾
|
|
|
+ $periodNum = Period::getCurrentQuarterPeriodByPeriodNum($periodNum);
|
|
|
+ }else{
|
|
|
+ $periodNum = Period::getCurrentMonthPeriodByPeriodNum($periodNum);
|
|
|
+ }
|
|
|
}
|
|
|
$field = implode(',', $fieldArray);
|
|
|
$data = CalcBonusQY::find()->select($field)->where(['PERIOD_NUM' => $periodNum])->asArray()->all();
|
|
|
@@ -641,7 +645,8 @@ class PushBaseDataToCalc extends BaseBusiness
|
|
|
$_offset = 0;
|
|
|
$field = implode(',', $fieldArray);
|
|
|
|
|
|
- $months = $this->getMonthsForQuarterly();
|
|
|
+ $months = $this->getMonthsByPeriodNum($this->_periodNum);
|
|
|
+ print_r($months);
|
|
|
|
|
|
//结算月
|
|
|
perfMonth:
|