This commit is contained in:
wangjinlei
2021-08-30 11:42:55 +08:00
parent 8951c60621
commit a01308bf14
5 changed files with 305 additions and 39 deletions

View File

@@ -79,13 +79,17 @@ class Reviewer extends Controller {
$data = $this->request->post();
//获取审稿人基本信息
$reviewer_info = $this->user_obj->where('user_id',$data['user_id'])->find();
$res = $this->article_reviewer_obj->field('t_article_reviewer.*,t_article.title article_title,t_journal.title journal_title,t_article.accept_sn accept_sn')
$res = $this->article_reviewer_obj->field('t_article_reviewer.*,t_article.title article_title,t_article.type,t_journal.title journal_title,t_article.accept_sn accept_sn')
->join('t_article', 't_article_reviewer.article_id = t_article.article_id', 'LEFT')
->join('t_journal', 't_article.journal_id = t_journal.journal_id', 'LEFT')
->where('t_article_reviewer.reviewer_id', $reviewer_info['user_id'])
->where('t_article_reviewer.state',0)
->select();
foreach ($res as $k => $v){
if($v['type']){
$res[$k]['type'] = translateType($v['type']);
}
}
$re['lists'] = $res;
return jsonSuccess($re);
}
@@ -108,7 +112,7 @@ class Reviewer extends Controller {
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$reviewer_info = $this->user_obj->where('user_id',$data['user_id'])->find();
$res = $this->article_reviewer_obj->field('t_article_reviewer.*,t_article.title article_title,t_journal.title journal_title,t_article.accept_sn accept_sn')
$res = $this->article_reviewer_obj->field('t_article_reviewer.*,t_article.title article_title,t_article.type,t_journal.title journal_title,t_article.accept_sn accept_sn')
->join('t_article', 't_article_reviewer.article_id = t_article.article_id', 'LEFT')
->join('t_journal', 't_article.journal_id = t_journal.journal_id', 'LEFT')
->where('t_article_reviewer.reviewer_id', $reviewer_info['user_id'])
@@ -116,7 +120,11 @@ class Reviewer extends Controller {
->order('t_article_reviewer.state')
->limit($limit_start, $data['pageSize'])
->select();
foreach ($res as $k => $v){
if($v['type']){
$res[$k]['type'] = translateType($v['type']);
}
}
$re['lists'] = $res;
return jsonSuccess($re);
}
@@ -146,42 +154,47 @@ class Reviewer extends Controller {
* @method POST
*
* @param name:user_id type:int require:1 desc:审稿人id
*
*/
public function getReviewerDetail1(){
$data = $this->request->post();
//获取基本信息
$base_info = $this->user_obj->join('t_user_reviewer_info','t_user.user_id = t_user_reviewer_info.reviewer_id')->where('t_user.user_id',$data['user_id'])->find();
$base_info = $this->user_obj->join('t_user_reviewer_info','t_user.user_id = t_user_reviewer_info.reviewer_id','left')->where('t_user.user_id',$data['user_id'])->find();
//增加major
$major_res = $this->reviewer_major_obj->where('major_id',$base_info['major'])->column('title');
$base_info['major_title'] = $major_res?$major_res[0]:'';
$cmajor_res = $this->reviewer_major_obj->where('major_id',$base_info['cmajor'])->column('title');
$base_info['cmajor_title'] = $cmajor_res?$cmajor_res[0]:'';
//获取审稿人期刊与对应身份
$frag = [];
$revs = $this->reviewer_to_journal_obj->join('t_journal','t_reviewer_to_journal.journal_id = t_journal.journal_id','left')->where('t_reviewer_to_journal.reviewer_id',$data['user_id'])->where('t_reviewer_to_journal.state',0)->select();
$chiefs = $this->chief_to_journal_obj->join('t_journal','t_chief_to_journal.journal_id = t_journal.journal_id','left')->where('t_chief_to_journal.user_id',$data['user_id'])->where('t_chief_to_journal.state',0)->select();
$boards = $this->board_to_journal_obj->join('t_journal','t_board_to_journal.journal_id = t_journal.journal_id','left')->where('t_board_to_journal.user_id',$data['user_id'])->where('t_board_to_journal.state',0)->select();
foreach ($revs as $v){
$frag[] = array(
'journal'=>$v,
'type'=>'reviewer'
);
}
foreach ($chiefs as $v){
$frag[] = array(
'journal'=>$v,
'type'=>'chief'
);
}
foreach ($boards as $v){
$frag[] = array(
'journal'=>$v,
'type'=>'board'
);
}
$journals = $this->reviewer_to_journal_obj->field('t_journal.*')->join('t_journal','t_reviewer_to_journal.journal_id = t_journal.journal_id','left')->where('t_reviewer_to_journal.reviewer_id',$data['user_id'])->where('t_reviewer_to_journal.state',0)->select();
$re['journals'] = $frag;
//获取审稿人期刊与对应身份
// $frag = [];
// $revs = $this->reviewer_to_journal_obj->join('t_journal','t_reviewer_to_journal.journal_id = t_journal.journal_id','left')->where('t_reviewer_to_journal.reviewer_id',$data['user_id'])->where('t_reviewer_to_journal.state',0)->select();
// $chiefs = $this->chief_to_journal_obj->join('t_journal','t_chief_to_journal.journal_id = t_journal.journal_id','left')->where('t_chief_to_journal.user_id',$data['user_id'])->where('t_chief_to_journal.state',0)->select();
// $boards = $this->board_to_journal_obj->join('t_journal','t_board_to_journal.journal_id = t_journal.journal_id','left')->where('t_board_to_journal.user_id',$data['user_id'])->where('t_board_to_journal.state',0)->select();
// foreach ($revs as $v){
// $frag[] = array(
// 'journal'=>$v,
// 'type'=>'reviewer'
// );
// }
// foreach ($chiefs as $v){
// $frag[] = array(
// 'journal'=>$v,
// 'type'=>'chief'
// );
// }
// foreach ($boards as $v){
// $frag[] = array(
// 'journal'=>$v,
// 'type'=>'board'
// );
// }
//
// $re['journals'] = $frag;
$re['journals'] = $journals;
$re['reviewer'] = $base_info;
return jsonSuccess($re);
}
@@ -261,8 +274,8 @@ class Reviewer extends Controller {
/**
* @title 获取文章文件列表
* @description 获取文章文件列表
* @title 获取文章文件manuscirpt
* @description 获取文章文件manuscirpt
* @author wangjinlei
* @url /api/Reviewer/getAFilelistByID
* @method POST
@@ -277,6 +290,16 @@ class Reviewer extends Controller {
return json(['data'=>$file_list]);
}
/**
* @title 获取文章文件picturesAndTables
* @description 获取文章文件picturesAndTables
* @author wangjinlei
* @url /api/Reviewer/getBFilelistByID
* @method POST
*
* @param name:revid type:int require:1 desc:art_rev_id文章审稿实例id
*
*/
public function getBFilelistByID(){
$rev_id = $this->request->post('revid');
$article_rev_info = $this->article_reviewer_obj->where('art_rev_id',$rev_id)->find();
@@ -286,8 +309,8 @@ class Reviewer extends Controller {
/**
* @title 获取文章审稿实例详情(审稿人,编辑)
* @description 获取文章审稿实例详情(审稿人,编辑)
* @title 审稿人详情页--获取文章审稿实例详情(审稿人,编辑)
* @description 审稿人详情页--获取文章审稿实例详情(审稿人,编辑)
* @author wangjinlei
* @url /api/Reviewer/getartrevdate
* @method POST
@@ -300,9 +323,10 @@ class Reviewer extends Controller {
$data = $this->request->post();
//查询实例数据
$res = $this->article_reviewer_obj->field('t_article_reviewer.*,t_article.title article_title,t_article.accept_sn accept_sn,t_user.account account')
$res = $this->article_reviewer_obj->field('t_article_reviewer.*,t_journal.*,t_article.title article_title,t_article.accept_sn accept_sn,t_user.account account')
->join('t_article', 't_article.article_id = t_article_reviewer.article_id', 'LEFT')
->join('t_user', 't_user.user_id = t_article_reviewer.reviewer_id', 'LEFT')
->join('t_journal','t_journal.journal_id = t_article.journal_id','left')
->where('t_article_reviewer.art_rev_id', $data['revid'])
->find();
@@ -317,8 +341,43 @@ class Reviewer extends Controller {
return json($res);
}
/**
* 提交问卷(审稿人)
* @title 提交问卷(审稿人)
* @description 提交问卷(审稿人)
* @author wangjinlei
* @url /api/Reviewer/questionSubmit
* @method POST
*
* @param name:art_rev_id type:int require:1 desc:art_rev_id文章审稿实例id
* @param name:qu1 type:int require:1 desc:问题1
* @param name:qu2 type:int require:1 desc:问题2
* @param name:qu3 type:int require:1 desc:问题3
* @param name:qu4 type:int require:1 desc:问题4
* @param name:qu5 type:int require:1 desc:问题5
* @param name:qu6 type:int require:1 desc:问题6
* @param name:qu7 type:int require:1 desc:问题7
* @param name:qu8 type:int require:1 desc:问题8
* @param name:qu9 type:int require:1 desc:问题9
* @param name:qu9contents type:string require:1 desc:问题9描述
* @param name:qu10 type:int require:1 desc:问题10
* @param name:qu10contents type:string require:1 desc:问题10描述
* @param name:qu11 type:int require:1 desc:问题11
* @param name:qu11contents type:string require:1 desc:问题11描述
* @param name:qu12 type:int require:1 desc:问题12
* @param name:qu12contents type:string require:1 desc:问题12描述
* @param name:qu13 type:int require:1 desc:问题13
* @param name:qu13contents type:string require:1 desc:问题13描述
* @param name:qu14 type:int require:1 desc:问题14
* @param name:qu14contents type:string require:1 desc:问题14描述
* @param name:qu15 type:int require:1 desc:问题15
* @param name:qu15contents type:string require:1 desc:问题15描述
* @param name:rated type:int require:1 desc:分数
* @param name:recommend type:int require:1 desc:最终决定
* @param name:other type:int require:1 desc:其他
* @param name:confident type:string require:1 desc:对编辑的意见
* @param name:comment type:string require:1 desc:对作者的意见
*
*/
public function questionSubmit() {
//接受参数,查询基础数据
@@ -429,6 +488,31 @@ class Reviewer extends Controller {
}
}
}
/**
* @title 待审文章页--获取待审文章列表
* @description 待审文章页--获取待审文章列表
* @author wangjinlei
* @url /api/Reviewer/getAllReviewerList
* @method POST
*
* @param name:journal_id type:int require:1 desc:期刊id
* @param name:pageIndex type:int require:1 desc:当前页码
* @param name:pageSize type:int require:1 desc:每个页面的数据条数
*
* @return articles:文章列表#
* @return count:总数#
*/
public function getAllReviewerList(){
$data = $this->request->post();
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$arts = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',2)->limit($limit_start,$data['pageSize'])->select();
$count = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',2)->count();
$re['articles'] = $arts;
$re['count'] = $count;
return jsonSuccess($re);
}
/**
* 存储reviewer文件历史信息