task stage

helper/task/handler.php

@@ -204,8 +204,9 @@ class handler
             }
 
             $task_id = $this->task_id;
-            $total_stage = (($end - $start) / 3600);
+            $total_stage = ceil(($end - $start) / 3600);
             $cur_stage = 0;
+            $expected_time = 0;
             $expected_curtime = time();
             $mod_task = Model('task');
 
@@ -244,8 +245,14 @@ class handler
                 }
                 if(!empty($task_id)){
                     if($cur_stage === 0) {
-                        $expected_time = (time()-$expected_curtime) * $total_stage;
-                        $expected_time = date("Y-m-d H:i", $expected_time);
+                        $now = time();
+                        if($now == $expected_curtime) {
+                            $expected_time = 10;
+                        }else{
+                            $expected_time = ($now - $expected_curtime) * ($total_stage / $cur_stage);
+                        }
+                        $expected_time = date("Y-m-d H:i:s", ($now + $expected_time));
+
                     }
                     $cur_stage++;
                     $stage = "导出进度：{$cur_stage}/{$total_stage}, 预计完成时间：{$expected_time}";