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

* Optimized update function for programplan model.

Browse Source
This commit is contained in:
jukui
2023-05-12 16:01:49 +08:00
parent 8045d80e5a
commit fae28afeec
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+3 -8
View File
@@ -921,15 +921,10 @@ class programplanModel extends model
$relatedExecutionsID = $this->loadModel('execution')->getRelatedExecutions($planID);
$relatedExecutionsID = !empty($relatedExecutionsID) ? implode(',', array_keys($relatedExecutionsID)) : '0';
$conditions = array();
$conditions['requiredFields'] = $this->config->programplan->edit->requiredFields ?? '';
$conditions['relatedExecutionsID'] = $relatedExecutionsID;
$conditions['oldProject'] = $oldPlan->project;
$conditions['oldParent'] = $oldPlan->parent;
$conditions['parentStage'] = $parentStage;
$conditions['setCode'] = $setCode;
$plan->relatedExecutionsID = $relatedExecutionsID;
$plan->parentStage = $setCode;
$result = $this->programplanTao->updateRow($plan, $conditions);
$result = $this->programplanTao->updateRow($plan, $oldPlan, $parentStage);
if(!$result) return false;
$this->setTreePath($planID);
module/programplan/tao.php
+6 -11
View File
@@ -20,25 +20,20 @@ class programplanTao extends programplanModel
* @access protected
* @return bool
*/
protected function updateRow(object $plan, array $conditions): bool
protected function updateRow(object $plan, object $oldPlan, object|null $parentStage): bool
{
$requiredFields = $conditions['requiredFields'] ?? '';
$projectIDList = $conditions['relatedExecutionsID'] ?? '';
$project = $conditions['project'] ?? '';
$parentStage = $conditions['parentStage'] ?? '';
$parent = $conditions['parent'] ?? '';
$setCode = $conditions['setCode'] ?? '';
$requiredFields = $this->config->programplan->edit->requiredFields ?? '';
$getName = false;
if($projectIDList && $project && $parentStage && $parent) $getName = true;
$getname = '';
if($plan->relatedExecutionsID && $oldPlan->project && $parentStage && $oldPlan->parent) $getname = true;
$this->dao->update(TABLE_PROJECT)->data($plan)
->autoCheck()
->batchCheckIF($requiredFields, $requiredFields, 'notempty')
->checkIF($plan->end != '0000-00-00', 'end', 'ge', $plan->begin)
->checkIF(!empty($plan->percent), 'percent', 'float')
->checkIF(!empty($plan->name) && $getName, 'name', 'unique', "id in ({$projectIDList}) and type in ('sprint','stage') and `project` = {$project} and `deleted` = '0'" . ($parentStage ? " and `parent` = {$parent}" : ''))
->checkIF(!empty($plan->code) and $setCode, 'code', 'unique', "id != {$plan->id} and type in ('sprint','stage','kanban') and `deleted` = '0'")
->checkIF(!empty($plan->name) && $getname, 'name', 'unique', "id in ({$plan->relatedExecutionsID}) and type in ('sprint','stage') and `project` = {$oldPlan->project} and `deleted` = '0' and `parent` = {$oldPlan->parent}")
->checkIF(!empty($plan->code) and $plan->setCode, 'code', 'unique', "id != {$plan->id} and type in ('sprint','stage','kanban') and `deleted` = '0'")
->where('id')->eq($plan->id)
->exec();