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

* [task#120990,done,2h,0h] Fix review deadline.

Browse Source
This commit is contained in:
tanghucheng
2024-06-19 09:07:38 +08:00
committed by 王于听
parent 0dfd29b44b
commit e628b85509
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/tao.php
+8 -5
View File
@@ -226,7 +226,8 @@ class programplanTao extends programplanModel
foreach($plans as $plan)
{
$planIdList[$plan->id] = $plan->id;
$reviewDeadline[$plan->id]['stageEnd'] = $plan->end;
$reviewDeadline[$plan->id]['stageEnd'] = $plan->end;
$reviewDeadline[$plan->id]['stageBegin'] = $plan->begin;
$data = $this->buildPlanDataForGantt($plan);
@@ -421,14 +422,16 @@ class programplanTao extends programplanModel
{
if($point->end and !helper::isZeroDate($point->end)) return $point->end;
$end = $reviewDeadline[$planID]['stageEnd'];
if(strpos($point->category, "DCP") !== false) return $this->getReviewDeadline($end, 2);
$end = $reviewDeadline[$planID]['stageEnd'];
$begin = $reviewDeadline[$planID]['stageBegin'];
$endDate = '';
if(strpos($point->category, "DCP") !== false) $endDate = $this->getReviewDeadline($end, 2);
if(strpos($point->category, "TR") !== false)
{
if(isset($reviewDeadline[$planID]['taskEnd']) and !helper::isZeroDate($reviewDeadline[$planID]['taskEnd'])) return $reviewDeadline[$planID]['taskEnd'];
return $this->getReviewDeadline($end);
$endDate = $this->getReviewDeadline($end);
}
return $end;
return ($endDate && $endDate <= $begin) ? $begin : $endDate;
}
/**