diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php index 08d1bff..c101465 100644 --- a/application/api/controller/Reviewer.php +++ b/application/api/controller/Reviewer.php @@ -184,10 +184,26 @@ class Reviewer extends Base // ->order('t_article_reviewer.state') ->limit($limit_start, $data['pageSize']) ->select(); + + //查询复审记录 chengxiaoling 20251110 start + $aReviewerRepeatLists = []; + if(!empty($res)){ + //查询复审 + $aArtRevId = array_column($res, 'art_rev_id'); + $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(); + if(!empty($aReviewerRepeat)){ + foreach ($aReviewerRepeat as $key => $value) { + $aReviewerRepeatLists[$value['art_rev_id']][] = $value; + } + } + } + //查询复审记录 chengxiaoling 20251110 end foreach ($res as $k => $v) { if ($v['type']) { $res[$k]['type'] = translateType($v['type']); } + $res[$k]['repeat'] = empty($aReviewerRepeatLists[$v['art_rev_id']]) ? [] : $aReviewerRepeatLists[$v['art_rev_id']]; } //加上文章领域 @@ -968,12 +984,12 @@ class Reviewer extends Base //生成pdf文件 // $reviewer_pdf = self::pdftest($journal_info['title']); $reviewer_ZS = self::createReviewerZS($data['art_rev_id']); - + $sArticleSn = empty($article_info['accept_sn']) ? '' : $article_info['accept_sn']; //发送email->编辑 $tt = 'Dear editor,
'; $tt .= 'Please check the new comments from the reviewer.
'; $tt .= 'Journal:' . $journal_info['title'] . ' and article title:' . $article_info['title']; - + $tt .= '
sn:'.$sArticleSn; $sendEditor = [ 'title' => $journal_info['title'], // 邮件标题 'content' => $tt, //邮件内容 @@ -2631,10 +2647,11 @@ class Reviewer extends Base $reviewer_ZS = self::createReviewerZS($data['art_rev_id']); //发送email->编辑 + $sArticleSn = empty($article_info['accept_sn']) ? '' : $article_info['accept_sn']; $tt = 'Dear editor,
'; - $tt .= 'Please check the new comments from the reviewer.sn:'.$article_info['accept_sn'].'
'; + $tt .= 'Please check the new comments from the reviewer.
'; $tt .= 'Journal:' . $journal_info['title'] . ' and article title:' . $article_info['title']; - + $tt .= '
sn:'.$sArticleSn; $sendEditor = [ 'title' => $journal_info['title'], // 邮件标题 'content' => $tt, //邮件内容