diff --git a/application/api/controller/Web.php b/application/api/controller/Web.php index 1b40a26..cf42eb9 100644 --- a/application/api/controller/Web.php +++ b/application/api/controller/Web.php @@ -299,11 +299,27 @@ class Web extends Base // $reviewers[$k]['re_question'] = null; // } } + + //查询终审信息 chengxiaoling 20250825 start + $iArticleId = empty($article_info['article_id']) ? 0 : $article_info['article_id']; + $aWhere = ['state' => ['between',[1,3]],'article_id' => $iArticleId]; + $aFinal = Db::name('article_reviewer_final')->field('state,suggest_for_editor,suggest_for_author,review_time,is_anonymous,reviewer_id')->where($aWhere)->select(); + if(!empty($aFinal)){ + $aUserId = array_unique(array_column($aFinal, 'reviewer_id')); + $aWhere = ['user_id' => ['in',$aUserId],'state' => 0]; + $aUser = Db::name('user')->where($aWhere)->column('user_id,realname'); + foreach ($aFinal as $key => $value) { + $aFinal[$key]['realname'] = empty($aUser[$value['reviewer_id']]) ? '' : $aUser[$value['reviewer_id']]; + } + } + //查询终审信息 chengxiaoling 20250825 end + $begin['type'] = 0; $begin['time'] = $article_info['ctime']; $frag[] = $begin; $reviewer_has = false; $reciv = false; + $bFinal = false; foreach ($msgs as $v){ if($v['state_to']==2&&!$reviewer_has){ $reviewer_has = true; @@ -332,6 +348,17 @@ class Web extends Base continue; } } + if($v['state_to']==8 &&!$bFinal && $reviewer_has){ + $bFinal = true; + if(!empty($aFinal)){ + $frag[] = [ + "type"=>$v['state_to'], + "response" => $aFinal, + "time"=>$v['ctime'] + ]; + continue; + } + } $frag[] = [ "type"=>$v['state_to'], "time"=>$v['ctime']