预计算

common/helpers/bonus/Calc/CalcConsole.php

@@ -150,10 +150,10 @@ class CalcConsole extends BaseBusiness
 
             if($formModel->load(['periodNum'=>$periodNum], '') && $formModel->autoPrePerf()) {
                 echo('自动计算已开始，请等待'.PHP_EOL);
-                CalcRecord::record($periodNum, '第' . $periodNum . '期，定时计算开始');
+                CalcRecord::record($periodNum, '【定时计算】第' . $periodNum . '期，定时计算开始');
             } else {
                 echo('自动计算未开始'.PHP_EOL);
-                CalcRecord::record($periodNum, '第' . $periodNum  . '期，定时计算未开始');
+                CalcRecord::record($periodNum, '【定时计算】第' . $periodNum  . '期，定时计算未开始');
             }
             return;
         }else{
@@ -176,6 +176,7 @@ class CalcConsole extends BaseBusiness
             return true;
         }
         $businessPeriod = Period::find()->where(['PERIOD_NUM' => $period['PERIOD_NUM']])->asArray()->one();
+        $startExecTime = $businessPeriod['START_EXEC_TIME'] ?? 0;
         if (
             $businessPeriod['SEND_STARTED_AT'] > 0 || $businessPeriod['IS_SENT'] > 0 // 已挂网
             || 1 != $businessPeriod['IS_PREPARING'] // 未在预计算中
@@ -188,8 +189,8 @@ class CalcConsole extends BaseBusiness
             && 1 == $period['IS_PERFED']
         ) {
             //拉取期业绩
-            CalcRecord::record($period['PERIOD_NUM'], '第' . $period['PERIOD_NUM'] . '期的预计算业绩数据已生成');
-            CalcRecord::record($period['PERIOD_NUM'], '开始获取第' . $period['PERIOD_NUM'] . '期的预计算期业绩数据');
+            CalcRecord::record($period['PERIOD_NUM'], '【期业绩】第' . $period['PERIOD_NUM'] . '期的预计算业绩数据已生成');
+            CalcRecord::record($period['PERIOD_NUM'], '【期业绩】开始获取第' . $period['PERIOD_NUM'] . '期的预计算期业绩数据');
 
             Period::updatePeriodIsPreparing($period['PERIOD_NUM'], Period::IS_PREPARING);
             $res = (new PullPerfDataFromCalc($period['PERIOD_NUM']))->start();
@@ -197,14 +198,15 @@ class CalcConsole extends BaseBusiness
 //                Period::updatePeriodIsProcessing($period['PERIOD_NUM'], Period::NOT_PROCESSING);
                 //设置预计算标识
                 Period::updatePeriodIsPreparing($period['PERIOD_NUM'], Period::NOT_PREPARING);
-                CalcRecord::record($period['PERIOD_NUM'], '第' . $period['PERIOD_NUM'] . '期的预计算期业绩数据已获取');
+                CalcRecord::record($period['PERIOD_NUM'], '【期业绩】第' . $period['PERIOD_NUM'] . '期的预计算期业绩数据已获取');
+                self::syncLogRecord($period['PERIOD_NUM'], $db, $startExecTime);
                 return $res;
             } else {
                 //结束计算状态
 //                Period::updatePeriodIsProcessing($period['PERIOD_NUM'], Period::NOT_PROCESSING);
                 //设置预计算标识
                 Period::updatePeriodIsPreparing($period['PERIOD_NUM'], Period::NOT_PREPARING);
-                CalcRecord::record($period['PERIOD_NUM'], '第' . $period['PERIOD_NUM'] . '期的预计算期业绩数据获取失败，原因：' . $res['msg']);
+                CalcRecord::record($period['PERIOD_NUM'], '【期业绩】第' . $period['PERIOD_NUM'] . '期的预计算期业绩数据获取失败，原因：' . $res['msg']);
                 return $res;
             }
         }

console/controllers/CalcController.php

@@ -98,7 +98,7 @@ class CalcController extends BaseController
         $params    = Cache::getAsyncParams($taskKey);
         $periodNum = $params['periodNum'] ?? 0;
         //生成业绩单 状态已修改
-        CalcRecord::record($periodNum, '开始生成业绩单');
+        CalcRecord::record($periodNum, '【生成业绩单】开始生成业绩单');
         //重置业务系统的计算进度标识
         \Yii::$app->db->createCommand()->update('AR_PERIOD', ['IS_PERFED' => 0, 'IS_CALCULATED' => 0], 'PERIOD_NUM=' . $periodNum)->execute();
         //重置计算系统的计算进度标识
@@ -107,27 +107,27 @@ class CalcController extends BaseController
 
         $res = (new GeneratePerfOrder($periodNum))->start();
         if (200 == $res['code']) {
-            CalcRecord::record($periodNum, '业绩单已生成');
+            CalcRecord::record($periodNum, '【生成业绩单】业绩单已生成');
         } else {
             Period::updatePeriodIsPreparing($periodNum, Period::NOT_PREPARING);
-            CalcRecord::record($periodNum, '第' . $periodNum . '期业绩单生成失败，原因：' . substr($res['msg'],0,100));
+            CalcRecord::record($periodNum, '【生成业绩单】第' . $periodNum . '期业绩单生成失败，原因：' . substr($res['msg'],0,100));
             return false;
         }
 
         //推送基础数据
-        CalcRecord::record($periodNum, '开始推送基础数据');
+        CalcRecord::record($periodNum, '【基础数据】开始推送基础数据');
         $res = (new PushBaseDataToCalc($periodNum))->start();
         if (200 == $res['code']) {
-            CalcRecord::record($periodNum, '基础数据完成推送');
+            CalcRecord::record($periodNum, '【基础数据】基础数据完成推送');
         } else {
             Period::updatePeriodIsPreparing($periodNum, Period::NOT_PREPARING);
-            CalcRecord::record($periodNum, '第' . $periodNum . '期基础数据推送失败，原因：' . $res['msg']);
+            CalcRecord::record($periodNum, '【基础数据】第' . $periodNum . '期基础数据推送失败，原因：' . $res['msg']);
             return false;
         }
         //todo 完成需要修改状态
 
         //通知结算系统生成期业绩
-        CalcRecord::record($periodNum, '开始生成' . $periodNum . '期的期业绩');
+        CalcRecord::record($periodNum, '【期业绩】开始生成' . $periodNum . '期的期业绩');
         \Yii::$app->$db->createCommand()->update('AR_PERIOD', ['IS_PREPARE' => 1], 'PERIOD_NUM=' . $periodNum)->execute();
         //todo 完成需要修改状态