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

* Fix bug #14512.

Browse Source
This commit is contained in:
zhouxin
2022-03-28 09:19:14 +00:00
parent 25338e33f5
commit 6bc82e81c1
3 changed files with 19 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
+15 -43
View File
@@ -623,7 +623,7 @@ class programModel extends model
$program->budgetUnit = $parentProgram->budgetUnit;
if(isset($program->budget))
{
$availableBudget = $this->getProgramBudgetLeft($parentProgram);
$availableBudget = $this->getBudgetLeft($parentProgram);
if($program->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
}
@@ -724,7 +724,7 @@ class programModel extends model
$program->budgetUnit = $parentProgram->budgetUnit;
if($program->budget != 0)
{
$availableBudget = $this->getProgramBudgetLeft($parentProgram);
$availableBudget = $this->getBudgetLeft($parentProgram);
if($program->budget > $availableBudget + $oldProgram->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
}
}
@@ -1090,63 +1090,35 @@ class programModel extends model
/**
* Get budget left.
*
* @param object $parentProgram
* @param int $parentProgram
* @param int $leftBudget
* @access public
* @return int
*/
public function getBudgetLeft($parentProgram)
public function getBudgetLeft($parentProgram, $leftBudget = 0)
{
if(empty($parentProgram)) return;
if(empty($parentProgram->id)) return;
$childGrade = $parentProgram->grade + 1;
$childSumBudget = $this->dao->select("sum(budget) as sumBudget")->from(TABLE_PROGRAM)
->where('path')->like("%{$parentProgram->id}%")
->andWhere('grade')->eq($childGrade)
->andWhere('deleted')->eq(0)
->andWhere('deleted')->eq('0')
->fetch('sumBudget');
return (float)$parentProgram->budget - (float)$childSumBudget;
}
$leftBudget += (float)$parentProgram->budget - (float)$childSumBudget;
/**
* Get program budget left.
*
* @param int $program
* @access public
* @return int
*/
public function getProgramBudgetLeft($program)
{
if(empty($program->id)) return;
if($program->budget > 0) return $this->getBudgetLeft($program);
$programList = array();
$programs = $this->dao->select('*')->from(TABLE_PROGRAM)
->where('id')->in($program->path)
->andWhere('deleted')->eq(0)
->andWhere('type')->eq('program')
->orderBy('id_asc')
->fetchAll();
foreach($programs as $id => $program)
if($parentProgram->budget == 0 and $parentProgram->parent)
{
$left = $this->getBudgetLeft($program);
if(isset($programs[$id + 1]) and $programs[$id + 1]->budget <= 0)
{
$programs[$id + 1]->budget = $left;
}
elseif(!isset($programs[$id + 1]))
{
$budgetLeft = $left;
break;
}
$parentParent = $this->getById($parentProgram->parent);
return $this->getBudgetLeft($parentParent, $leftBudget);
}
else
{
return $leftBudget;
}
return $budgetLeft > 0 ? $budgetLeft : 0;
}
/**
* Get program parent pairs
*