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

* Optimize code review finded problems.

Browse Source
This commit is contained in:
liuchenglong
2023-05-11 08:40:26 +00:00
parent 44193c4f61
commit 6d0c4053d2
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+5 -7
View File
@@ -909,7 +909,7 @@ class programplanModel extends model
* @access public
* @return bool|array
*/
public function update(int $planID = 0, int $projectID = 0, $plan = null): bool|array
public function update(int $planID = 0, int $projectID = 0, object $plan = null): bool|array
{
$oldPlan = $this->getByID($planID);
@@ -1255,15 +1255,13 @@ class programplanModel extends model
public function computeProgress(int $stageID, string $action = '', bool $isParent = false): bool
{
$this->loadModel('execution');
$this->loadModel('project');
$this->loadModel('action');
$stage = $this->execution->getByID($stageID);
$project = $this->project->getByID($stage->project);
if(isset($project->model) && $project->model != 'waterfall' && $project->model != 'waterfallplus') return false;
if(empty($stage) || empty($stage->path)) return false;
$project = $this->loadModel('project')->getByID($stage->project);
if(isset($project->model) && $project->model != 'waterfall' && $project->model != 'waterfallplus') return false;
$action = strtolower($action);
$parentIdList = explode(',', trim($stage->path, ','));
$parentIdList = array_reverse($parentIdList);
@@ -1301,7 +1299,7 @@ class programplanModel extends model
if(isset($newParent) && $newParent)
{
$this->dao->update(TABLE_EXECUTION)->data($newParent)->where('id')->eq($id)->exec();
$this->action->create('execution', $id, $parentAction, '', $parentAction);
$this->loadModel('action')->create('execution', $id, $parentAction, '', $parentAction);
}
unset($newParent, $parentAction);
}