Przeglądaj źródła

1feature/EK-3969

ryan 3 dni temu
rodzic
commit
9fe7d68b28
1 zmienionych plików z 7 dodań i 1 usunięć
  1. 7 1
      common/helpers/bonus/Calc/CalcConsole.php

+ 7 - 1
common/helpers/bonus/Calc/CalcConsole.php

@@ -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;