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

* Finish task #40134.

Browse Source
This commit is contained in:
Yagami
2021-07-12 15:43:16 +08:00
parent c12c6c3873
commit ad4e5f7c44
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+39 -5
View File
@@ -3400,15 +3400,49 @@ class storyModel extends model
$stories[$story->id] = $story;
}
$allReviewers = $this->dao->select('story,reviewer,result')->from(TABLE_STORYREVIEW)->where('story')->in(array_keys($stories))->orderBy('version')->fetchGroup('story', 'reviewer');
/* Set child story id into array. */
$storyIdList = array();
if(isset($stories['id']))
{
$storyIdList = array($stories['id'] => $stories['id']);
}
else
{
$storyIdList = array_keys($stories);
foreach($stories as $story)
{
if(isset($story->children)) $storyIdList = array_merge($storyIdList, array_keys($story->children));
}
}
$allReviewers = $this->dao->select('story,reviewer,result')->from(TABLE_STORYREVIEW)->where('story')->in($storyIdList)->orderBy('version')->fetchGroup('story', 'reviewer');
foreach($allReviewers as $storyID => $reviewerList)
{
$stories[$storyID]->reviewer = array_keys($reviewerList);
$stories[$storyID]->notReview = array();
foreach($reviewerList as $reviewer => $reviewInfo)
if(isset($stories[$storyID]))
{
if($reviewInfo->result == '') $stories[$storyID]->notReview[] = $reviewer;
$stories[$storyID]->reviewer = array_keys($reviewerList);
$stories[$storyID]->notReview = array();
foreach($reviewerList as $reviewer => $reviewInfo)
{
if($reviewInfo->result == '') $stories[$storyID]->notReview[] = $reviewer;
}
}
else
{
foreach($stories as $id => $story)
{
if(!isset($story->children)) continue;
if(isset($story->children[$storyID]))
{
$story->children[$storyID]->reviewer = array_keys($reviewerList);
$story->children[$storyID]->notReview = array();
}
foreach($reviewerList as $reviewer => $reviewInfo)
{
if($reviewInfo->result == '') $story->children[$storyID]->notReview[] = $reviewer;
}
}
}
}