From 8837c4c1003def2c7f18f12adc8031939cc1da2f Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Fri, 5 Aug 2022 03:08:10 +0000
Subject: [PATCH] * Fix bug $26002,25249

---
 module/execution/model.php | 12 ++++++++++--
 module/task/model.php      | 11 +++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 586732f803..f338c645db 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4361,6 +4361,8 @@ class executionModel extends model
         $this->loadModel('execution');
         $this->loadModel('programplan');
 
+        $today = helper::today();
+
         if(!$isChild)
         {
             $trClass = 'is-top-level table-nest-child-hide';
@@ -4388,8 +4390,14 @@ class executionModel extends model
         echo helper::isZeroDate($execution->begin) ? '<td></td>' : '<td>' . $execution->begin . '</td>';
         if(!helper::isZeroDate($execution->end))
         {
-            $today = helper::today();
-            echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed">' . $execution->end . '</td>' : '<td>' . $execution->end . '</td>';
+            if($execution->status != 'closed')
+            {
+                echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed" title="已延期">' . $execution->end . '</td>' : '<td>' . $execution->end . '</td>';
+            }
+            else
+            {
+                echo '<td>' . $execution->end . '</td>';
+            }
         }
         else
         {
diff --git a/module/task/model.php b/module/task/model.php
index 450d536602..2ff908f5e1 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3782,6 +3782,7 @@ class taskModel extends model
      */
     public function buildNestedList($execution, $task, $isChild = false, $showmore = false, $users = array())
     {
+        $today = helper::today();
         $showmore = $showmore ? 'showmore' : '';
         $trAttrs  = "data-id='t$task->id'";
         if(!$isChild)
@@ -3809,8 +3810,14 @@ class taskModel extends model
         $list .= helper::isZeroDate($task->estStarted) ? '<td></td>' : '<td>' . $task->estStarted . '</td>';
         if(!helper::isZeroDate($task->deadline))
         {
-            $today = helper::today();
-            $list .= strtotime($today) > strtotime($task->deadline) ? '<td class="delayed">' . $task->deadline . '</td>' : '<td>' . $task->deadline . '</td>';
+            if($task->status != 'done')
+            {
+                $list .= strtotime($today) > strtotime($task->deadline) ? '<td class="delayed" title="已延期">' . $task->deadline . '</td>' : '<td>' . $task->deadline . '</td>';
+            }
+            else
+            {
+                $list .= '<td>' . $task->deadline . '</td>';
+            }
         }
         else
         {