This commit is contained in:
wangjinlei
2023-07-31 16:53:59 +08:00
parent 0b706eca4c
commit eaef11fbc2
6 changed files with 205 additions and 40 deletions

View File

@@ -302,11 +302,24 @@ class Article extends Base
//增加审稿意见信息
foreach ($res as $key => $val) {
$cache_review = $this->article_reviewer_obj
->field("t_article_reviewer.*,t_article_reviewer_question.rated")
->field("t_article_reviewer.*,t_article_reviewer_question.rated,t_user.realname")
->join("t_article_reviewer_question", "t_article_reviewer_question.art_rev_id = t_article_reviewer.art_rev_id", 'left')
->join("t_user","t_user.user_id = t_article_reviewer.reviewer_id","left")
->where("t_article_reviewer.article_id", $val['article_id'])
->where("t_article_reviewer.state", 'in', [0, 1, 2, 3])
->select();
//添加复审信息
foreach ($cache_review as $k => $v){
$repeat = $this->article_reviewer_repeat_obj->where('art_rev_id',$v['art_rev_id'])->select();
if($repeat){
$last = count($repeat)-1;
$cache_review[$k]['can_repeat'] = ($repeat[$last]['state']==1&&$repeat[$last]['recommend']==3)?1:0;
$cache_review[$k]['repeat'] = $repeat;
}else{//不存在复审实例,可添加
$cache_review[$k]['can_repeat'] = 1;
$cache_review[$k]['repeat'] = [];
}
}
$res[$key]['review'] = $cache_review;
//查询作者信息
@@ -427,53 +440,42 @@ class Article extends Base
*/
public function getArticleDetail()
{
//接受参数
$data = $this->request->post();
//查询文章基础数据
$where['t_article.article_id'] = $data['articleId'];
$article_res = $this->article_obj->field('t_article.*,t_journal.title journalname,t_user.account')->join(array(['t_journal', 't_journal.journal_id = t_article.journal_id', 'LEFT'], ['t_user', 't_user.user_id = t_article.user_id', 'LEFT']))->where($where)->find();
//查询文章状态跟踪信息
$article_msg = $this->article_msg_obj->where(['article_id' => $data['articleId']])->where('state', 0)->select();
$suggest = '';
//如果是退修状态,显示退休信息
// if($article_res['state']==4){
// $lastbean = end($article_msg);
// $suggest = $lastbean['content'];
// }
//查询审稿人审稿建议
// if($article_res['state']==4){
$suggest = $this->article_reviewer_obj->field('t_article_reviewer.*,t_article_reviewer_question.qu9_contents,t_article_reviewer_question.qu10_contents,t_article_reviewer_question.qu11_contents,t_article_reviewer_question.qu12_contents,t_article_reviewer_question.qu13_contents,t_article_reviewer_question.qu14_contents,t_article_reviewer_question.qu15_contents,t_article_reviewer_question.comments comments')
->join('t_article_reviewer_question', 't_article_reviewer.art_rev_id=t_article_reviewer_question.art_rev_id', 'left')
->where('t_article_reviewer.state', '<', 4)
->where('t_article_reviewer.state', '>', 0)
->where('t_article_reviewer.article_id', $article_res['article_id'])
->select();
// }
// $suggest = $this->article_reviewer_obj->field('t_article_reviewer.*,t_article_reviewer_question.qu9_contents,t_article_reviewer_question.qu10_contents,t_article_reviewer_question.qu11_contents,t_article_reviewer_question.qu12_contents,t_article_reviewer_question.qu13_contents,t_article_reviewer_question.qu14_contents,t_article_reviewer_question.qu15_contents,t_article_reviewer_question.comments comments')
// ->join('t_article_reviewer_question', 't_article_reviewer.art_rev_id=t_article_reviewer_question.art_rev_id', 'left')
// ->where('t_article_reviewer.state', '<', 4)
// ->where('t_article_reviewer.state', '>', 0)
// ->where('t_article_reviewer.article_id', $article_res['article_id'])
// ->select();
//查询major信息
// $major_data = [];
// if($article_res['major_id']!=0){
// $major_data['major'] = $this->reviewer_major_obj->where('major_id',$article_res['major_id'])->find();
// }else{
// $major_data['major'] = null;
// }
// if($article_res['cmajor_id']!=0){
// $major_data['cmajor'] = $this->reviewer_major_obj->where('major_id',$article_res['cmajor_id'])->find();
// }else{
// $major_data['cmajor'] = null;
// }
//新领域查询
$suggest = $this->article_reviewer_obj->where("state","in",[1,2,3])->where('article_id',$article_res['article_id'])->select();
foreach ($suggest as $k => $v){
$fr = [];
$c = $this->article_reviewer_question_obj->where('art_rev_id',$v['art_rev_id'])->find();
$fr[] = $c;
$f = $this->article_reviewer_repeat_obj->where('art_rev_id',$v['art_rev_id'])->select();
foreach ($f as $val){
$fr[] = $val;
}
$suggest[$k]['question'] = $fr;
}
// foreach ($suggest as $k => $v){
// $ca = $this->article_reviewer_repeat_obj->where('art_rev_id',$v['art_rev_id'])->select();
// $suggest[$k]['repeats'] = $ca;
// }
$major = $this->getMajorStr($article_res['major_id']);
//查询文章作者信息
$author_res = $this->article_author_obj->where('article_id', $data['articleId'])->where('state', 0)->select();
//查询转投信息
$transfer_res = $this->article_transfer_obj->where('article_id', $data['articleId'])->select();
//查询建议转投详情
$transfer_info = $this->article_transfer_obj
->field('t_article_transfer.*,t_journal.title jourtitle')
@@ -481,7 +483,6 @@ class Article extends Base
->where('t_article_transfer.article_id', $data['articleId'])
->where('t_article_transfer.state', 2)
->find();
//更新文章操作记录状态
if ($data['human'] == 'editor') {
$up_data['author_act'] = 0;
@@ -489,7 +490,6 @@ class Article extends Base
$up_data['editor_act'] = 0;
}
$this->article_obj->where('article_id', $data['articleId'])->update($up_data);
return json(['article' => $article_res, 'msg' => $article_msg, 'authors' => $author_res, 'suggest' => $suggest, 'transfer' => $transfer_res, 'transinfo' => $transfer_info, 'major' => $major]);
}
@@ -2217,6 +2217,12 @@ class Article extends Base
$journal_info = $this->journal_obj->where('journal_id', $article_info['journal_id'])->find();
$user_res = $this->user_obj->where('user_id', $article_info['user_id'])->find();
//验证是否在黑名单
$black = $this->user_black_obj->where('user_id',$user_res['user_id'])->where('black_state',0)->find();
if($black){
return jsonError("Your account is currently blacklisted by TMR Publishing Group. Please contact the official email of the journal you wish to submit to for further clarification.");
}
$author_email = [];
$authors = $this->article_author_obj->where('article_id', $data['article_id'])->where('state', 0)->select();