工序产出率统计优化

application/api/controller/Decision.php

@@ -393,6 +393,10 @@ class Decision extends Api
 
             // 遍历月份
             foreach ($months as $month => $monthName) {
+                if (isset($data[$month])){
+                    $count = count($data[$month][$process]);
+                }
+
                 $totalRate = 0;
 
                 // 检查月份是否存在于数据中
@@ -401,14 +405,16 @@ class Decision extends Api
                     if (isset($data[$month][$process])) {
                         // 累加废品率
                         foreach ($data[$month][$process] as $rate) {
-                            $totalRate += floatval($rate["废品率"]);
+                            $totalRate += floatval(1-$rate["废品率"]);
                         }
                     }
                 }
-
+                if ($count > 0){
+                    $rateNumber = $totalRate/$count;
+                }
                 // 格式化为百分比字符串，保留两位小数
                 if ($totalRate > 0) {
-                    $result[$index][$monthName] = sprintf("%.2f%%", (1-$totalRate) * 100);
+                    $result[$index][$monthName] = sprintf("%.2f%%", $rateNumber * 100);
                 } else {
                     $result[$index][$monthName] = ""; // 如果没有数据，则为空字符串
                 }
@@ -440,7 +446,6 @@ class Decision extends Api
         }
         $this->success('成功',$result);
     }
-
     /**
      * 获取年分数据
      * @return void
@@ -451,7 +456,6 @@ class Decision extends Api
             $this->error('请求错误');
         }
         $data = \db('工单_质量考核汇总')
-
                 ->group('year')
                 ->column('YEAR(STR_TO_DATE(sys_ny, "%Y%m")) as year');
         $this->success('成功',$data);