Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [task#144206,done,2h] optimize task compute delay logic for the stage list.

Browse Source
This commit is contained in:
tianshujie
2025-05-27 16:39:13 +08:00
committed by 田淑杰
parent 9092b8f9ba
commit cae4cab141
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+11 -5
View File
@@ -873,16 +873,21 @@ class programplanModel extends model
->fetchAll('id');
}
$plans = $this->loadModel('execution')->getByIdList($planIdList);
$isGantt = $this->app->rawModule == 'programplan' && $this->app->rawMethod == 'browse';
if($isGantt) $plans = $this->loadModel('execution')->getByIdList($planIdList);
$today = helper::today();
$begin = $today;
$end = $today;
$deadlineList = array();
foreach($tasks as $taskID => $task)
{
$plan = $plans[$task->execution];
$deadline = helper::isZeroDate($task->deadline) ? $plan->end : $task->deadline;
$begin = $deadline < $begin ? $deadline : $begin;
if(!$isGantt && helper::isZeroDate($task->deadline)) continue;
$deadline = $task->deadline;
if(helper::isZeroDate($task->deadline)) $deadline = $plans[$task->execution]->end;
$begin = $deadline < $begin ? $deadline : $begin;
$deadlineList[$taskID] = $deadline;
}
@@ -901,7 +906,8 @@ class programplanModel extends model
/* Delayed or not?. */
$task->delay = 0;
$isComputeDelay = !in_array($task->status, array('cancel', 'closed')) || ($task->status == 'closed' && !helper::isZeroDate($task->finishedDate) && $task->closedReason != 'cancel');
$isNotCancel = !in_array($task->status, array('cancel', 'closed')) || ($task->status == 'closed' && !helper::isZeroDate($task->finishedDate) && $task->closedReason != 'cancel');
$isComputeDelay = $isNotCancel && !empty($deadlineList[$taskID]);
if($isComputeDelay)
{
$endDate = helper::isZeroDate($task->finishedDate) ? $today : $task->finishedDate;