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

* Finish task #44005.

Browse Source
This commit is contained in:
孙广明
2021-11-05 11:24:19 +08:00
parent 31f72ade7b
commit d420eba707
7 changed files with 23 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/programplan/model.php
View File

@@ -480,8 +480,11 @@ class programplanModel extends model
foreach($datas as $data)
{
/* Set planDuration and realDuration. */
$data->planDuration = $this->getDuration($data->begin, $data->end);
$data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
if(isset($this->config->maxVersion))
{
$data->planDuration = $this->getDuration($data->begin, $data->end);
$data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
}
$projectChanged = false;
$data->days = helper::diffDate($data->end, $data->begin) + 1;
@@ -671,8 +674,11 @@ class programplanModel extends model
}
/* Set planDuration and realDuration. */
$plan->planDuration = $this->getDuration($plan->begin, $plan->end);
$plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
if(isset($this->config->maxVersion))
{
$plan->planDuration = $this->getDuration($plan->begin, $plan->end);
$plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
}
if($planChanged) $plan->version = $oldPlan->version + 1;
if(empty($plan->parent)) $plan->parent = $projectID;