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

* Fix bug #32518.

Browse Source
This commit is contained in:
hufangzhou
2023-03-01 00:55:15 +00:00
parent e0bb071d99
commit e93bfa4498
2 changed files with 9 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+4 -31
View File
@@ -1511,16 +1511,7 @@ class programplanModel extends model
{
if($parent->status != 'wait')
{
$newParent = new stdclass();
$newParent->status = 'wait';
$newParent->realBegan = '';
$newParent->closedDate = '';
$newParent->closedBy = '';
$newParent->canceledDate = '';
$newParent->canceledBy = '';
$newParent->suspendedDate = '';
$newParent->lastEditedBy = $this->app->user->account;
$newParent->lastEditedDate = helper::now();
$newParent = $this->execution->buildExecutionByStatus('wait');
$parentAction = 'waitbychild';
}
}
@@ -1528,12 +1519,7 @@ class programplanModel extends model
{
if($parent->status != 'closed')
{
$newParent = new stdclass();
$newParent->status = 'closed';
$newParent->closedDate = helper::now();
$newParent->closedBy = $this->app->user->account;
$newParent->lastEditedBy = $this->app->user->account;
$newParent->lastEditedDate = helper::now();
$newParent = $this->execution->buildExecutionByStatus('closed');
$parentAction = 'closedbychild';
}
}
@@ -1541,11 +1527,7 @@ class programplanModel extends model
{
if($parent->status != 'suspended')
{
$newParent = new stdclass();
$newParent->status = 'suspended';
$newParent->suspendedDate = helper::now();
$newParent->lastEditedBy = $this->app->user->account;
$newParent->lastEditedDate = helper::now();
$newParent = $this->execution->buildExecutionByStatus('suspended');
$parentAction = 'suspendedbychild';
}
}
@@ -1553,16 +1535,7 @@ class programplanModel extends model
{
if($parent->status != 'doing')
{
$newParent = new stdclass();
$newParent->status = 'doing';
$newParent->realBegan = helper::today();
$newParent->closedDate = '';
$newParent->closedBy = '';
$newParent->canceledDate = '';
$newParent->canceledBy = '';
$newParent->suspendedDate = '';
$newParent->lastEditedBy = $this->app->user->account;
$newParent->lastEditedDate = helper::now();
$newParent = $this->execution->buildExecutionByStatus('doing');
$parentAction = $parent->status == 'wait' ?'startbychildstart' : 'startbychild' . $action;
}
}