diff --git a/application/api/controller/Finalreview.php b/application/api/controller/Finalreview.php index 3cf1aff..2a1deb7 100644 --- a/application/api/controller/Finalreview.php +++ b/application/api/controller/Finalreview.php @@ -265,7 +265,7 @@ class Finalreview extends Base ]; //邮箱 - $email = $aUser['email']; + $email = 'tmr@tmrjournals.com';//$aUser['email']; //用户名 $realname = empty($aUser['account']) ? '' : $aUser['account']; $realname = empty($aUser['realname']) ? $realname : $aUser['realname']; @@ -415,7 +415,7 @@ class Finalreview extends Base } //查询文章相关信息 $aWhere = ['article_id' => $aReviewerFinal['article_id'],'journal_id' => $aBoard]; - return $this->getArticle($aWhere); + return $this->getReviewRecord($aWhere); } /** * @title 查看审稿记录 @@ -439,7 +439,7 @@ class Finalreview extends Base $aReviewerFinal['update_time'] = date('Y-m-d H:i:s',$aReviewerFinal['update_time']); //查询文章相关信息 $aWhere = ['article_id' => $aReviewerFinal['article_id'],'record_id' => $iId]; - $aResult = json_decode($this->getArticle($aWhere),true); + $aResult = json_decode($this->getReviewRecord($aWhere),true); $aArticle = empty($aResult['data']) ? [] : $aResult['data']; if(empty($aArticle)){ return json_encode($aResult); @@ -454,7 +454,7 @@ class Finalreview extends Base * @param record_id 记录ID * @param state 状态 */ - private function getArticle($aParam = []){ + public function getReviewRecord($aParam = []){ //获取参数 $aParam = empty($aParam) ? $this->request->post() : $aParam; @@ -567,7 +567,7 @@ class Finalreview extends Base } } } - return json_encode(['status' => 1,'msg' => 'success','data' => ['article_review' => $aReviewerData,'article_review_repeat' => $aReviewerRepeat,'article_response' => $aResponse,'article_final' => empty($aFinal) ? [] : $aFinal,'article' => $aArticle]]); + return json_encode(['status' => 1,'msg' => 'success','data' => ['article_review' => $aReviewerData,'article_review_repeat' => empty($aReviewerRepeat) ? [] : $aReviewerRepeat,'article_response' => $aResponse,'article_final' => empty($aFinal) ? [] : $aFinal,'article' => $aArticle]]); } /** * @title 获取终审文章列表 @@ -637,6 +637,7 @@ class Finalreview extends Base $aArticle = Db::name('article') ->field('article_id,user_id,journal_id,accept_sn,title,type,keywords,abstrart,manuscirpt_url,special_num,remarks,state,scoring') ->where($aWhere) + ->order('article_id desc') ->page($iPage, $iSize) ->select(); if(empty($aArticle)){ @@ -660,7 +661,6 @@ class Finalreview extends Base $aAiReview = Db::name('article_ai_review')->field('article_id,content')->where($aWhere)->column('article_id,content'); //查询终审信息 - $aWhere['state'] = ['between',[1,3]]; $aFinal = Db::name('article_reviewer_final')->field('id,article_id,reviewer_id,state')->where($aWhere)->select(); $aUserId = empty($aFinal) ? [] : array_unique(array_column($aFinal, 'reviewer_id'));