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

Merge branch 'sprint/174_tianshujie_16977' into 'master'

Browse Source 
* Fix bug #16977.

See merge request easycorp/zentaopms!706
This commit is contained in:
李玉春
2021-12-01 06:21:29 +00:00
parent 876af8d939 e74dd9ad80
commit 3d8fc0dcfe
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/model.php
+7 -1
View File
@@ -94,7 +94,13 @@ class productplanModel extends model
$plans = $this->reorder4Children($plans);
$planIdList = array_keys($plans);
$planProjects = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($product)->andWhere('plan')->in(array_keys($plans))->fetchPairs('plan', 'project');
$planProjects = $this->dao->select('t1.*,t2.type')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->eq($product)
->andWhere('t1.plan')->in(array_keys($plans))
->andWhere('t2.type')->in('sprint,stage')
->fetchPairs('plan', 'project');
$storyCountInTable = $this->dao->select('plan,count(story) as count')->from(TABLE_PLANSTORY)->where('plan')->in($planIdList)->groupBy('plan')->fetchPairs('plan', 'count');
$product = $this->loadModel('product')->getById($product);
if($product->type == 'normal')