终审
This commit is contained in:
@@ -520,7 +520,7 @@ class Finalreview extends Base
|
|||||||
$aWhere = ['art_rev_id' => ['in',$aArtRevId],'state' => 0];
|
$aWhere = ['art_rev_id' => ['in',$aArtRevId],'state' => 0];
|
||||||
|
|
||||||
//查询初审问卷
|
//查询初审问卷
|
||||||
$aQuestion = Db::name('article_reviewer_question')->field('art_rev_id,score,comments,ctime,is_anonymous')->where($aWhere)->order('ctime asc')->select();
|
$aQuestion = Db::name('article_reviewer_question')->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');
|
||||||
|
|
||||||
//查询复审
|
//查询复审
|
||||||
@@ -544,12 +544,8 @@ class Finalreview extends Base
|
|||||||
$value['realname'] = empty($aUser[$value['reviewer_id']]) ? '' : $aUser[$value['reviewer_id']];
|
$value['realname'] = empty($aUser[$value['reviewer_id']]) ? '' : $aUser[$value['reviewer_id']];
|
||||||
$value['ctime'] = empty($aQuestionInfo['ctime']) ? date('Y-m-d H:i:s',$value['ctime']) : date('Y-m-d H:i:s',$aQuestionInfo['ctime']);
|
$value['ctime'] = empty($aQuestionInfo['ctime']) ? date('Y-m-d H:i:s',$value['ctime']) : date('Y-m-d H:i:s',$aQuestionInfo['ctime']);
|
||||||
$value['is_anonymous'] = empty($aQuestionInfo['is_anonymous']) ? 0 : $aQuestionInfo['is_anonymous'];
|
$value['is_anonymous'] = empty($aQuestionInfo['is_anonymous']) ? 0 : $aQuestionInfo['is_anonymous'];
|
||||||
if(!empty($aQuestionInfo['ctime'])){
|
$value['question'] = $aQuestionInfo;
|
||||||
unset($aQuestionInfo['ctime']);
|
$aReviewerData[] = $value;
|
||||||
unset($aQuestionInfo['is_anonymous']);
|
|
||||||
}
|
|
||||||
$aReviewerData[] = array_merge($value,$aQuestionInfo);
|
|
||||||
//时间处理
|
|
||||||
|
|
||||||
//复审
|
//复审
|
||||||
$aReviewerRepeatInfo = empty($aReviewerRepeat[$value['art_rev_id']]) ? [] : $aReviewerRepeat[$value['art_rev_id']];
|
$aReviewerRepeatInfo = empty($aReviewerRepeat[$value['art_rev_id']]) ? [] : $aReviewerRepeat[$value['art_rev_id']];
|
||||||
@@ -600,7 +596,7 @@ class Finalreview extends Base
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return json_encode(['status' => 1,'msg' => 'success','data' => ['article_review' => $aReviewerData,'article_review_repeat' => empty($aReviewerRepeat) ? [] : $aReviewerRepeat,'article_response' => empty($aResponse) ? [] : $aResponse,'article_final' => empty($aFinal) ? [] : $aFinal,'article' => $aArticle]]);
|
return json_encode(['status' => 1,'msg' => 'success','data' => ['article_review' => $aReviewerData,'article_review_repeat' => empty($aReviewerRepeatData) ? [] : $aReviewerRepeatData,'article_response' => empty($aResponse) ? [] : $aResponse,'article_final' => empty($aFinal) ? [] : $aFinal,'article' => $aArticle]]);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @title 获取终审文章列表
|
* @title 获取终审文章列表
|
||||||
|
|||||||
Reference in New Issue
Block a user