From 63ee113190c465144b312ae803b8f7b411dc5309 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Thu, 14 Jul 2022 00:44:15 +0000
Subject: [PATCH 1/3] fixbug_25216

---
 module/task/control.php | 1 -
 module/task/model.php   | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 8cb9eedb1b..25e91330ee 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1213,7 +1213,6 @@ class task extends control
             if($task->consumed - $estimate->consumed == 0)
             {
                 $actionID = $this->loadModel('action')->create('task', $estimate->task, 'Adjusttasktowait');
-                $this->action->logHistory($actionID, $changes);
             }
             if($task->consumed - $estimate->consumed == 0)
             {
diff --git a/module/task/model.php b/module/task/model.php
index 3d5e36a323..23217c9d44 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2842,7 +2842,7 @@ class taskModel extends model
         elseif($consumed == 0)
         {
             $data->status = 'wait';
-            $data->left   = $task->left + $estimate->consumed;
+            $data->left   = $task->estimate;
         }
         else
         {
@@ -2871,12 +2871,10 @@ class taskModel extends model
         $oldTask = new stdClass();
         $oldTask->consumed = $task->consumed;
         $oldTask->left     = $task->left;
-        $oldTask->status   = $task->status;
 
         $newTask = new stdClass();
         $newTask->consumed = $data->consumed;
         $newTask->left     = $data->left;
-        $newTask->status   = $data->status;
 
         if(!dao::isError()) return common::createChanges($oldTask, $newTask);
     }

From 51fe9cc511e2b3a713164d3302ca7c756300dcd9 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Thu, 14 Jul 2022 01:22:53 +0000
Subject: [PATCH 2/3] fixbug_25216

---
 module/task/model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/task/model.php b/module/task/model.php
index 23217c9d44..7ec1155f3e 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2871,10 +2871,12 @@ class taskModel extends model
         $oldTask = new stdClass();
         $oldTask->consumed = $task->consumed;
         $oldTask->left     = $task->left;
+        $oldTask->status   = $task->status;
 
         $newTask = new stdClass();
         $newTask->consumed = $data->consumed;
         $newTask->left     = $data->left;
+        $newTask->status   = $task->status;
 
         if(!dao::isError()) return common::createChanges($oldTask, $newTask);
     }

From a40ae1ee630d635dad726e81aeeb3abe98766a71 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Thu, 14 Jul 2022 01:43:36 +0000
Subject: [PATCH 3/3] fixbug_25216

---
 module/task/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/model.php b/module/task/model.php
index 7ec1155f3e..b2284e7174 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2876,7 +2876,7 @@ class taskModel extends model
         $newTask = new stdClass();
         $newTask->consumed = $data->consumed;
         $newTask->left     = $data->left;
-        $newTask->status   = $task->status;
+        $newTask->status   = $data->status;
 
         if(!dao::isError()) return common::createChanges($oldTask, $newTask);
     }