From 58567b28e7250865210a97cb3176d558a44a5677 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 4 Aug 2022 11:09:48 +0800
Subject: [PATCH] * Finish task #62887.

---
 module/programplan/model.php | 6 +++---
 module/task/model.php        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index ae44e791a8..361dddfd0b 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -337,7 +337,7 @@ class programplanModel extends model
     public function getDataForGanttGroupByAssignedTo($executionID, $productID, $baselineID = 0, $selectCustom = '', $returnJson = true)
     {
         $plans = $this->getStage($executionID, $productID);
-        
+
         $datas       = array();
         $planIdList  = array();
         $isMilestone = "<icon class='icon icon-flag icon-sm red'></icon> ";
@@ -414,7 +414,7 @@ class programplanModel extends model
             $groupKey = $groupID . $group;
             $datas['data'][$groupKey] = $dataGroup;
 
-            foreach($tasks as $taskID => $task) 
+            foreach($tasks as $taskID => $task)
             {
                 // if($task->parent > 0 and $task->assignedTo)
                 // {
@@ -423,7 +423,7 @@ class programplanModel extends model
                 //     a($task->parent);exit;
                 // }
                 $execution = zget($plans, $task->execution, array());
-            
+
                 $priIcon   = sprintf($taskPri, $task->pri, $task->pri, $task->pri);
 
                 $estStart  = helper::isZeroDate($task->estStarted)  ? '' : $task->estStarted;
diff --git a/module/task/model.php b/module/task/model.php
index 296ac6ebaa..2c520ac2fa 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3935,7 +3935,7 @@ class taskModel extends model
             }
 
             $updateStartArg = !empty($objectData->realStarted) ? 'realStarted' : 'estStarted';
-            $updateEndArg   = !empty($objectData->finishedDate) ? 'finishedDate' : 'deadline';
+            $updateEndArg   = strpos($objectData->status, 'closed, done') !== false ? 'finishedDate' : 'deadline';
             $this->dao->update(TABLE_TASK)
                 ->set($updateStartArg)->eq($post->start_date)
                 ->set($updateEndArg)->eq($post->end_date)