|
@@ -140,6 +140,7 @@ class Period extends \common\components\ActiveRecord
|
|
|
* @return array|null|\yii\db\ActiveRecord
|
|
* @return array|null|\yii\db\ActiveRecord
|
|
|
*/
|
|
*/
|
|
|
public function setPeriodNum($periodNum = null){
|
|
public function setPeriodNum($periodNum = null){
|
|
|
|
|
+ LoggerTool::debug(['Calc-0-3', $periodNum]);
|
|
|
if($periodNum === 0 || $periodNum === null || $periodNum === ''){
|
|
if($periodNum === 0 || $periodNum === null || $periodNum === ''){
|
|
|
//if($this->nowPeriodArr === null){
|
|
//if($this->nowPeriodArr === null){
|
|
|
$this->nowPeriodArr = static::find()->where('IS_CLOSED=0')->orderBy('PERIOD_NUM ASC')->asArray()->one();
|
|
$this->nowPeriodArr = static::find()->where('IS_CLOSED=0')->orderBy('PERIOD_NUM ASC')->asArray()->one();
|
|
@@ -147,6 +148,7 @@ class Period extends \common\components\ActiveRecord
|
|
|
$this->periodArr = $this->nowPeriodArr;
|
|
$this->periodArr = $this->nowPeriodArr;
|
|
|
$periodNum = $this->nowPeriodArr['PERIOD_NUM'];
|
|
$periodNum = $this->nowPeriodArr['PERIOD_NUM'];
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ LoggerTool::debug(['Calc-0-4', $periodNum, $this->periodNum]);
|
|
|
if($periodNum !== $this->periodNum){
|
|
if($periodNum !== $this->periodNum){
|
|
|
$this->periodArr = static::findOneAsArray(['PERIOD_NUM'=>$periodNum]);
|
|
$this->periodArr = static::findOneAsArray(['PERIOD_NUM'=>$periodNum]);
|
|
|
}
|
|
}
|
|
@@ -177,6 +179,7 @@ class Period extends \common\components\ActiveRecord
|
|
|
public function getNowPeriodNum(){
|
|
public function getNowPeriodNum(){
|
|
|
$this->setPeriodNum();
|
|
$this->setPeriodNum();
|
|
|
if($this->nowPeriodArr){
|
|
if($this->nowPeriodArr){
|
|
|
|
|
+ LoggerTool::debug(['Calc-0-2', $this->nowPeriodArr['PERIOD_NUM']]);
|
|
|
return $this->nowPeriodArr['PERIOD_NUM'];
|
|
return $this->nowPeriodArr['PERIOD_NUM'];
|
|
|
} else {
|
|
} else {
|
|
|
return self::SYSTEM_START_PERIOD_NUM;
|
|
return self::SYSTEM_START_PERIOD_NUM;
|