终审相关调整
This commit is contained in:
@@ -1059,7 +1059,7 @@ class Finalreview extends Base
|
|||||||
$aArtRevId = array_column($aArticleReviewer, 'art_rev_id');
|
$aArtRevId = array_column($aArticleReviewer, 'art_rev_id');
|
||||||
$aWhere = ['art_rev_id' => ['in',$aArtRevId],'state' => 0];
|
$aWhere = ['art_rev_id' => ['in',$aArtRevId],'state' => 0];
|
||||||
//查询初审问卷
|
//查询初审问卷
|
||||||
$aQuestion = Db::name('article_reviewer_question')->where($aWhere)->order('ctime asc')->column('art_rev_id,ctime');
|
$aQuestion = Db::name('article_reviewer_question')->field('art_rev_id,ctime,score')->where($aWhere)->order('ctime asc')->select();
|
||||||
$aQuestion = empty($aQuestion) ? [] : array_column($aQuestion, null,'art_rev_id');
|
$aQuestion = empty($aQuestion) ? [] : array_column($aQuestion, null,'art_rev_id');
|
||||||
|
|
||||||
//查询复审
|
//查询复审
|
||||||
@@ -1072,7 +1072,9 @@ class Finalreview extends Base
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach ($aArticleReviewer as $key => $value) {
|
foreach ($aArticleReviewer as $key => $value) {
|
||||||
$value['ctime'] = empty($aQuestion[$value['art_rev_id']]) ? $value['ctime'] : $aQuestion[$value['art_rev_id']];
|
$aQuestionData = empty($aQuestion[$value['art_rev_id']]) ? [] : $aQuestion[$value['art_rev_id']];
|
||||||
|
$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['repeat'] = empty($aReviewerRepeatLists[$value['art_rev_id']]) ? [] : $aReviewerRepeatLists[$value['art_rev_id']];
|
||||||
$aArticleReviewer[$key] = $value;
|
$aArticleReviewer[$key] = $value;
|
||||||
}
|
}
|
||||||
@@ -1082,7 +1084,7 @@ class Finalreview extends Base
|
|||||||
$aReviewerFinal = Db::name('article_reviewer_final')->field('id,state,suggest_for_editor,suggest_for_author,update_time,reviewer_id,is_anonymous')->where($aWhere)->select();
|
$aReviewerFinal = Db::name('article_reviewer_final')->field('id,state,suggest_for_editor,suggest_for_author,update_time,reviewer_id,is_anonymous')->where($aWhere)->select();
|
||||||
if(!empty($aReviewerFinal)){
|
if(!empty($aReviewerFinal)){
|
||||||
//查询作者信息
|
//查询作者信息
|
||||||
$aUserId = array_unique(array_column($aReviewerFinal, 'user_id'));
|
$aUserId = array_unique(array_column($aReviewerFinal, 'reviewer_id'));
|
||||||
$aWhere = ['user_id' => ['in',$aUserId],'state' => 0];
|
$aWhere = ['user_id' => ['in',$aUserId],'state' => 0];
|
||||||
$aUser = Db::name('user')->where($aWhere)->column('user_id,realname');
|
$aUser = Db::name('user')->where($aWhere)->column('user_id,realname');
|
||||||
foreach ($aReviewerFinal as $key => $value) {
|
foreach ($aReviewerFinal as $key => $value) {
|
||||||
@@ -1120,7 +1122,7 @@ class Finalreview extends Base
|
|||||||
}
|
}
|
||||||
//查询审稿记录
|
//查询审稿记录
|
||||||
$aWhere = ['reviewer_id' => $iReviewerId,'id' => $iId];
|
$aWhere = ['reviewer_id' => $iReviewerId,'id' => $iId];
|
||||||
$aReviewerFinal = Db::name('article_reviewer_final')->field('id,article_id,state')->where($aWhere)->find();
|
$aReviewerFinal = Db::name('article_reviewer_final')->field('id,article_id,state,reviewer_id')->where($aWhere)->find();
|
||||||
if(empty($aReviewerFinal)){
|
if(empty($aReviewerFinal)){
|
||||||
return json_encode(['status' => 3,'msg' => 'Review record does not exist or review has been completed']);
|
return json_encode(['status' => 3,'msg' => 'Review record does not exist or review has been completed']);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user