fix 修复完成率计算错误问题

lisgroup · lisgroup · commit ea1e13f504e9 · 2020-06-01T11:21:17.000+08:00
diff --git a/laravel/app/Http/Repository/ApiRepository.php b/laravel/app/Http/Repository/ApiRepository.php
@@ -89,7 +89,7 @@ public function autoFailed()
                 continue;
             }
             // 记录完成率
-            $finish = ($excel->total_excel / ($excel->sort_index + 1)) * 100;
+            $finish = (($excel->sort_index + 1) / $excel->total_excel) * 100;
             $finish = sprintf("%.2f", $finish);
             if (($finish > '96' && strtotime($excel->created_at) + 5 < time()) || ($finish > '50' && strtotime($excel->created_at) + 60 < time()) || ($finish > '10' && strtotime($excel->created_at) + 300 < time()) || ($finish > '1' && strtotime($excel->created_at) + 600 < time())) {
                 ApiExcel::where('id', $excel->id)->update(['state' => 5]);

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function autoFailed()`
`89`	`89`	`continue;`
`90`	`90`	`}`
`91`	`91`	`// 记录完成率`
`92`		`- $finish = ($excel->total_excel / ($excel->sort_index + 1)) * 100;`
	`92`	`+ $finish = (($excel->sort_index + 1) / $excel->total_excel) * 100;`
`93`	`93`	`$finish = sprintf("%.2f", $finish);`
`94`	`94`	`if (($finish > '96' && strtotime($excel->created_at) + 5 < time()) \|\| ($finish > '50' && strtotime($excel->created_at) + 60 < time()) \|\| ($finish > '10' && strtotime($excel->created_at) + 300 < time()) \|\| ($finish > '1' && strtotime($excel->created_at) + 600 < time())) {`
`95`	`95`	`ApiExcel::where('id', $excel->id)->update(['state' => 5]);`