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

Merge branch 'sprint/tianshujie_fixbug' into 'master'

Browse Source 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2588
This commit is contained in:
孙广明
2022-03-28 08:57:08 +00:00
parent b87ce16ef3 93e2945604
commit 11b4d993dd
9 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/projectrelease/control.php
+7 -6
View File
@@ -225,14 +225,15 @@ class projectrelease extends control
}
$storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1);
$stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($release->stories)->andWhere('deleted')->eq(0)
->beginIF($type == 'story')->orderBy($orderBy)->fi()
->page($storyPager)
->fetchAll('id');
$stories = $this->dao->select('t1.*, t2.stage')->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_STORYSTAGE)->alias('t2')->on('t1.id = t2.story')
->where('t1.id')->in($release->stories)
->andWhere('t1.deleted')->eq(0)
->beginIF($type == 'story')->orderBy("t1.$orderBy")->fi()
->page($storyPager)
->fetchAll('id');
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
$stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($release->stories)->andWhere('branch')->eq($release->branch)->fetchPairs('story', 'stage');
foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage;
$bugPager = new pager($type == 'bug' ? $recTotal : 0, $recPerPage, $type == 'bug' ? $pageID : 1);
$bugs = $this->dao->select('*')->from(TABLE_BUG)->where('id')->in($release->bugs)->andWhere('deleted')->eq(0)