|
|
@@ -143,7 +143,6 @@ class Period extends \common\components\ActiveRecord
|
|
|
if($periodNum === 0 || $periodNum === null || $periodNum === ''){
|
|
|
//if($this->nowPeriodArr === null){
|
|
|
$this->nowPeriodArr = static::find()->where('IS_CLOSED=0')->orderBy('PERIOD_NUM ASC')->asArray()->one();
|
|
|
- LoggerTool::debug(['Calc-0-3', $this->nowPeriodArr]);
|
|
|
//}
|
|
|
$this->periodArr = $this->nowPeriodArr;
|
|
|
$periodNum = $this->nowPeriodArr['PERIOD_NUM'];
|
|
|
@@ -241,7 +240,7 @@ class Period extends \common\components\ActiveRecord
|
|
|
* @return int|string
|
|
|
*/
|
|
|
public function getNowYearMonth(){
|
|
|
- $this->setPeriodNum();
|
|
|
+ $this->setPeriodNum(122);
|
|
|
if($this->nowPeriodArr){
|
|
|
return $this->nowPeriodArr['CALC_YEAR'].Tool::numFix($this->nowPeriodArr['CALC_MONTH']);
|
|
|
} else {
|
|
|
@@ -906,14 +905,19 @@ class Period extends \common\components\ActiveRecord
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ LoggerTool::debug('calc-l');
|
|
|
$period = static::findOneAsArray(['PERIOD_NUM' => $periodNum]);
|
|
|
// 若计算服务中CALC_ID不为空,则不允许计算
|
|
|
+ LoggerTool::debug('calc-2');
|
|
|
if ($calcPeriod) {
|
|
|
if ($calcPeriod['CALC_ID']) return true;
|
|
|
}
|
|
|
+ LoggerTool::debug('calc-3');
|
|
|
//挂网则拒绝操作,返回true则拒绝操作
|
|
|
if ($period['IS_SENT'] == self::SEND_FINISH) return true;
|
|
|
+ LoggerTool::debug('calc-4');
|
|
|
if ($period['IS_PROCESSING'] == self::IS_PROCESSING) return true;
|
|
|
+ LoggerTool::debug('calc-5');
|
|
|
return false;
|
|
|
}
|
|
|
|