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

* Fix bug #29031,#29042,#29039.

Browse Source
This commit is contained in:
tanghucheng
2022-10-27 15:41:59 +08:00
parent 1ca5456053
commit 376ce75e79
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+7 -2
View File
@@ -1189,9 +1189,10 @@ class executionModel extends model
->andWhere('t2.type')->eq('stage')
->andWhere('t2.grade')->eq(1)
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.parent')->eq($oldExecution)
->andWhere('t2.parent')->eq($oldExecution->id)
->fetch('total');
if(!$oldPercentTotal) $oldPercentTotal = 0;
if($type == 'create') $percentTotal = $percent + $oldPercentTotal;
if(!empty($oldExecution) and $oldExecution->grade == 1) $percentTotal = $oldPercentTotal - $oldExecution->percent + $this->post->percent;
@@ -4713,7 +4714,11 @@ class executionModel extends model
if(!empty($execution->children))
{
foreach($execution->children as $child) $this->printNestedList($child, true, $users, $productID);
foreach($execution->children as $child)
{
$child->division = $execution->division;
$this->printNestedList($child, true, $users, $productID);
}
}
if(!empty($execution->tasks))