|
|
@@ -172,7 +172,13 @@ class CalcConsole extends BaseBusiness
|
|
|
|
|
|
if ($nowDate >= 1 && $nowDate <= 4){
|
|
|
//判断上一期是否手动计算
|
|
|
- $prevPeriod = Period::find()->where('PERIOD_NUM= :PERIOD_NUM',['PERIOD_NUM'=>$prevPeriodNum])->where('HAND_CALC_TIME< :HAND_CALC_TIME',['HAND_CALC_TIME'=>strtotime(date('Y-m-01'))])->asArray()->one();
|
|
|
+ $prevPeriod = Period::find()
|
|
|
+ ->where('PERIOD_NUM = :PERIOD_NUM AND HAND_CALC_TIME < :HAND_CALC_TIME', [
|
|
|
+ ':PERIOD_NUM' => $prevPeriodNum,
|
|
|
+ ':HAND_CALC_TIME' => strtotime(date('Y-m-01'))
|
|
|
+ ])
|
|
|
+ ->asArray()
|
|
|
+ ->one();
|
|
|
if (!empty($prevPeriod)){
|
|
|
echo('上一期上次手动计算时间'.($prevPeriod['hand_calc_time']??'----').',期数切换为' . $prevPeriodNum . PHP_EOL);
|
|
|
$periodNum = $prevPeriodNum;
|