From 4a25481663d79decfea841a81a3c9dd4360a3757 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Sun, 2 Jun 2024 17:21:03 +0800
Subject: [PATCH] * Fix recalculate metriclib.

---
 module/metric/control.php          | 7 ++++---
 module/metric/js/recalculate.ui.js | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/metric/control.php b/module/metric/control.php
index 6522cfff4a..a9725c4a14 100755
--- a/module/metric/control.php
+++ b/module/metric/control.php
@@ -164,17 +164,18 @@ class metric extends control
      *
      * @param  string $code
      * @param  string $date
+     * @param  string $calcType
      * @access public
      * @return void
      */
-    public function ajaxUpdateSingleMetricLib($code, $date)
+    public function ajaxUpdateSingleMetricLib($code, $date, $calcType)
     {
         $date = str_replace('_', '-', $date);
         $dateType = $this->metric->getDateTypeByCode($code);
 
-        $isCalcByCron = $this->metric->isCalcByCron($code, $date, $dateType);
+        if($calcType == 'inference') $isCalcByCron = $this->metric->isCalcByCron($code, $date, $dateType);
 
-        if(!$isCalcByCron)
+        if($calcType == 'all' || !$isCalcByCron)
         {
             $calc   = $this->metric->calculateMetricByCode($code);
             $record = $this->metricZen->getRecordByCodeAndDate($code, $calc, $date);
diff --git a/module/metric/js/recalculate.ui.js b/module/metric/js/recalculate.ui.js
index f133f3533f..2e40300e93 100644
--- a/module/metric/js/recalculate.ui.js
+++ b/module/metric/js/recalculate.ui.js
@@ -61,7 +61,7 @@ function recalculateSingle(code, dateType, startDate, endDate)
         var date = dateToString(dateRange[index]);
         var $html = recalculateLog(date);
 
-        var link = $.createLink('metric', 'ajaxUpdateSingleMetricLib', 'code=' + code + '&date=' + date);
+        var link = $.createLink('metric', 'ajaxUpdateSingleMetricLib', 'code=' + code + '&date=' + date + '&calcType=' + calcType);
         $.get(link, function(result){
             $('.recalculate-log').append($html);
             updateSingleHistory(dateRange, index + 1);