diff --git a/application/api/controller/Finalreview.php b/application/api/controller/Finalreview.php index 7d1d2d2..bbb57a8 100644 --- a/application/api/controller/Finalreview.php +++ b/application/api/controller/Finalreview.php @@ -1081,15 +1081,17 @@ class Finalreview extends Base $aQuestion = empty($aQuestion) ? [] : array_column($aQuestion, null,'art_rev_id'); //查询复审 - $aReviewerRepeatLists = []; - $aWhere = ['art_rev_id' => ['in',$aArtRevId],'recommend' => ['between',[1,3]]]; - $aReviewerRepeat = Db::name('article_reviewer_repeat')->field('art_rev_rep_id,art_rev_id,recommend,ctime,stime')->where($aWhere)->select(); + $aReviewerRepeatLists = $aReviewerRepeatListsData = []; + $aWhere = ['art_rev_id' => ['in',$aArtRevId],'recommend' => ['between',[0,3]]]; + $aReviewerRepeat = Db::name('article_reviewer_repeat')->field('art_rev_rep_id,art_rev_id,recommend,ctime,stime,state')->where($aWhere)->select(); if(!empty($aReviewerRepeat)){ foreach ($aReviewerRepeat as $key => $value) { - $aReviewerRepeatLists[$value['art_rev_id']][] = $value; + if(in_array($value['recommend'], [1,2,3])){ + $aReviewerRepeatLists[$value['art_rev_id']][] = $value; + } + $aReviewerRepeatListsData[$value['art_rev_id']][] = $value; } } - //查询作者信息 $aUserId = array_unique(array_column($aArticleReviewer, 'reviewer_id')); $aWhere = ['user_id' => ['in',$aUserId],'state' => 0]; @@ -1100,6 +1102,18 @@ class Finalreview extends Base $value['ctime'] = empty($aQuestionData['ctime']) ? $value['ctime'] : $aQuestionData['ctime']; $value['score'] = empty($aQuestionData['score']) ? 0 : $aQuestionData['score']; $value['repeat'] = empty($aReviewerRepeatLists[$value['art_rev_id']]) ? [] : $aReviewerRepeatLists[$value['art_rev_id']]; + //判断是否复审 + $value['can_repeat'] = empty($aQuestionData) ? 0 : 1; + if(!empty($aReviewerRepeatListsData[$value['art_rev_id']])){ + $aEnd = end($aReviewerRepeatListsData[$value['art_rev_id']]); + $iState = empty($aEnd['state']) ? 0 : $aEnd['state']; + $iRecommend = empty($aEnd['recommend']) ? 0 : $aEnd['recommend']; + if($iState == 1 && $iRecommend == 3){ + $value['can_repeat'] = 1; + }else{ + $value['can_repeat'] = 0; + } + } $value['rated'] = empty($aQuestionData['rated']) ? 0 : $aQuestionData['rated']; $value['realname'] = empty($aUser[$value['reviewer_id']]) ? '' : $aUser[$value['reviewer_id']]; $value['recommend'] = empty($aQuestionData['recommend']) ? 0 : $aQuestionData['recommend'];