diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php
index e725ce7..f4c9365 100644
--- a/application/api/controller/Reviewer.php
+++ b/application/api/controller/Reviewer.php
@@ -11,7 +11,8 @@ use think\Queue;
* @title 审稿人接口
* @description 审稿人接口
*/
-class Reviewer extends Controller {
+class Reviewer extends Controller
+{
protected $user_obj = '';
protected $user_reviewer_obj = '';
@@ -31,7 +32,8 @@ class Reviewer extends Controller {
protected $country_obj = '';
//put your code here
- public function __construct(\think\Request $request = null) {
+ public function __construct(\think\Request $request = null)
+ {
parent::__construct($request);
$this->user_obj = Db::name('user');
$this->user_reviewer_obj = Db::name('user_reviewer_apply');
@@ -65,18 +67,19 @@ class Reviewer extends Controller {
* @return data:数据列表#
* @return total:数据条数
*/
- public function getReviewerList() {
+ public function getReviewerList()
+ {
$data = $this->request->post();
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$reviewer_info = $this->user_obj->where('account', $data['username'])->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')
- ->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.state", 2)
- ->order('t_article_reviewer.state')
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->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.state", 2)
+ ->order('t_article_reviewer.state')
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
$count = $this->article_reviewer_obj->where('t_article_reviewer.reviewer_id', $reviewer_info['user_id'])->count();
return json(['code' => 0, 'data' => $res, 'total' => $count]);
}
@@ -92,17 +95,18 @@ class Reviewer extends Controller {
*
* @return lists:数据列表#
*/
- public function getReviewerListPending() {
+ public function getReviewerListPending()
+ {
$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_article.abstrart,t_article.major_id,t_article.cmajor_id,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.state", 2)
- ->where('t_article_reviewer.state', 0)
- ->select();
+ ->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.state", 2)
+ ->where('t_article_reviewer.state', 0)
+ ->select();
foreach ($res as $k => $v) {
if ($v['type']) {
$res[$k]['type'] = translateType($v['type']);
@@ -133,21 +137,22 @@ class Reviewer extends Controller {
*
* @return lists:数据列表#
*/
- public function getReviewerListHistory() {
+ public function getReviewerListHistory()
+ {
$data = $this->request->post();
$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.article_id,t_article.journal_id,t_article.major_id,t_article.abstrart,t_article.cmajor_id,t_article.state astate,t_article.title article_title,t_article.type,t_journal.title journal_title,t_article.accept_sn accept_sn,t_article_reviewer_question.recommend,t_article_reviewer_question.ctime recommenttime')
- ->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')
- ->join("t_article_reviewer_question","t_article_reviewer_question.art_rev_id = t_article_reviewer.art_rev_id","left")
- ->where('t_article_reviewer.reviewer_id', $reviewer_info['user_id'])
- ->where('t_article_reviewer.state', 'in', [1, 2, 3, 4])
- ->where("t_article.article_id",">",0)
-// ->order('t_article_reviewer.state')
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->field('t_article_reviewer.*,t_article.article_id,t_article.journal_id,t_article.major_id,t_article.abstrart,t_article.cmajor_id,t_article.state astate,t_article.title article_title,t_article.type,t_journal.title journal_title,t_article.accept_sn accept_sn,t_article_reviewer_question.recommend,t_article_reviewer_question.ctime recommenttime')
+ ->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')
+ ->join("t_article_reviewer_question", "t_article_reviewer_question.art_rev_id = t_article_reviewer.art_rev_id", "left")
+ ->where('t_article_reviewer.reviewer_id', $reviewer_info['user_id'])
+ ->where('t_article_reviewer.state', 'in', [1, 2, 3, 4])
+ ->where("t_article.article_id", ">", 0)
+ // ->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']);
@@ -162,7 +167,7 @@ class Reviewer extends Controller {
$res[$k]['cmajor'] = $cmajor['title'];
}
- $count = $this->article_reviewer_obj->join('t_article', 't_article_reviewer.article_id = t_article.article_id', 'LEFT')->where('t_article_reviewer.reviewer_id', $reviewer_info['user_id'])->where('t_article_reviewer.state', 'in', [1, 2, 3, 4])->where("t_article.article_id",">",0)->count();
+ $count = $this->article_reviewer_obj->join('t_article', 't_article_reviewer.article_id = t_article.article_id', 'LEFT')->where('t_article_reviewer.reviewer_id', $reviewer_info['user_id'])->where('t_article_reviewer.state', 'in', [1, 2, 3, 4])->where("t_article.article_id", ">", 0)->count();
$re['lists'] = $res;
$re['count'] = $count;
return jsonSuccess($re);
@@ -180,17 +185,18 @@ class Reviewer extends Controller {
*
* @return lists:数据列表#
*/
- public function getArtRevDetail() {
+ public function getArtRevDetail()
+ {
$data = $this->request->post();
$res = $this->article_reviewer_obj->where('reviewer_id', $data['user_id'])->where('article_id', $data['article_id'])->find();
if ($res !== null) {
return jsonError('Instance exists');
}
$article = $this->article_obj
- ->field('t_article.*,t_journal.title journal_title')
- ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
- ->where('t_article.article_id', $data['article_id'])
- ->find();
+ ->field('t_article.*,t_journal.title journal_title')
+ ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
+ ->where('t_article.article_id', $data['article_id'])
+ ->find();
$re['article'] = $article;
return jsonSuccess($re);
}
@@ -199,7 +205,8 @@ class Reviewer extends Controller {
* 获取审稿人详情
*
*/
- public function getReviewerDetail() {
+ public function getReviewerDetail()
+ {
$uid = $this->request->post('rid');
//获取基本信息
$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', $uid)->find();
@@ -223,13 +230,14 @@ class Reviewer extends Controller {
*
* @return reviewer:审稿人详情信息#
*/
- public function getReviewerByNameEmail() {
+ public function getReviewerByNameEmail()
+ {
$data = $this->request->post();
$check = $this->user_obj
- ->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_user.user_id', 'left')
- ->where('t_user.account|t_user.email', 'like', '%' . $data['account'] . '%')
- ->where('t_user.state', 0)
- ->find();
+ ->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_user.user_id', 'left')
+ ->where('t_user.account|t_user.email', 'like', '%' . $data['account'] . '%')
+ ->where('t_user.state', 0)
+ ->find();
$check['title'] = $check['technical'];
$re['reviewer'] = $check;
return jsonSuccess($re);
@@ -245,7 +253,8 @@ class Reviewer extends Controller {
* @param name:user_id type:int require:1 desc:审稿人id
*
*/
- public function getReviewerDetail1() {
+ public function getReviewerDetail1()
+ {
$data = $this->request->post();
//获取基本信息
@@ -259,30 +268,30 @@ class Reviewer extends Controller {
$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();
//获取审稿人期刊与对应身份
-// $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;
+ // $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);
@@ -291,7 +300,8 @@ class Reviewer extends Controller {
/**
* 更改审稿人信息
*/
- public function editReviewer() {
+ public function editReviewer()
+ {
$data = $this->request->post();
$this->user_reviewer_info_obj->where('reviewer_info_id', $data['reviewer_info_id'])->update(['major' => $data['major'], 'cmajor' => $data['cmajor']]);
return json(['code' => 0]);
@@ -317,7 +327,8 @@ class Reviewer extends Controller {
* @param name:introduction type:string require:0 desc:简介
* @param name:company type:string require:0 desc:单位
*/
- public function editUserReviewer() {
+ public function editUserReviewer()
+ {
$data = $this->request->post();
$update['email'] = trim($data['email']);
$update['realname'] = isset($data['realname']) ? trim($data['realname']) : '';
@@ -340,7 +351,8 @@ class Reviewer extends Controller {
/**
* 上传/修改文章审核实例详情两个文件（编辑，审稿人）
*/
- public function articleReviewerUpSubmit($type) {
+ public function articleReviewerUpSubmit($type)
+ {
//接受参数,查询信息
$data = $this->request->post();
$artrev_info = $this->article_reviewer_obj->where('art_rev_id', $data['artrevid'])->find();
@@ -375,20 +387,20 @@ class Reviewer extends Controller {
//发送email提醒
if ($type != 'editor') {
-// $tt = 'Dear editor,
';
-// $tt .= 'Please check the new comments from the reviewer.';
-// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
- $sendEditor=[
- 'title'=>$journal_info['title'], // 邮件标题
- 'content'=>'Dear editor,
Please check the new comments from the reviewer.',//邮件内容
- 'user_id'=>$journal_info['editor_id'], //收件人ID
- 'email'=>$editor_info['email'],// 收件人邮箱
- 'journal_id'=>$journal_info['journal_id'], // 期刊ID
- 'sendEmail'=>$journal_info['email'], // 期刊邮箱
- 'sendPassword'=>$journal_info['epassword'], // 期刊密码
- 'from_name'=>$journal_info['title']
+ // $tt = 'Dear editor,
';
+ // $tt .= 'Please check the new comments from the reviewer.';
+ // sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
+ $sendEditor = [
+ 'title' => $journal_info['title'], // 邮件标题
+ 'content' => 'Dear editor,
Please check the new comments from the reviewer.', //邮件内容
+ 'user_id' => $journal_info['editor_id'], //收件人ID
+ 'email' => $editor_info['email'], // 收件人邮箱
+ 'journal_id' => $journal_info['journal_id'], // 期刊ID
+ 'sendEmail' => $journal_info['email'], // 期刊邮箱
+ 'sendPassword' => $journal_info['epassword'], // 期刊密码
+ 'from_name' => $journal_info['title']
];
- Queue::push('app\api\job\domail@fire',$sendEditor,'domail');
+ Queue::push('app\api\job\domail@fire', $sendEditor, 'domail');
}
//保存usermsg
@@ -400,7 +412,8 @@ class Reviewer extends Controller {
/**
* 获取文章审稿实例文件列表
*/
- public function getFilelistByID() {
+ public function getFilelistByID()
+ {
$rev_id = $this->request->post('revid');
$where['art_rev_id'] = $rev_id;
$res = $this->article_reviewer_file_obj->where($where)->select();
@@ -421,7 +434,8 @@ class Reviewer extends Controller {
* @param name:revid type:int require:1 desc:art_rev_id文章审稿实例id
*
*/
- public function getAFilelistByID() {
+ public function getAFilelistByID()
+ {
$rev_id = $this->request->post('revid');
$article_rev_info = $this->article_reviewer_obj->where('art_rev_id', $rev_id)->find();
$file_list = $this->article_file_obj->where('article_id', $article_rev_info['article_id'])->where('type_name', 'manuscirpt')->order('file_id desc')->limit(1)->select();
@@ -438,7 +452,8 @@ class Reviewer extends Controller {
* @param name:revid type:int require:1 desc:art_rev_id文章审稿实例id
*
*/
- public function getBFilelistByID() {
+ public function getBFilelistByID()
+ {
$rev_id = $this->request->post('revid');
$article_rev_info = $this->article_reviewer_obj->where('art_rev_id', $rev_id)->find();
$file_list = $this->article_file_obj->where('article_id', $article_rev_info['article_id'])->where('type_name', 'picturesAndTables')->order('file_id desc')->limit(1)->select();
@@ -455,17 +470,18 @@ class Reviewer extends Controller {
* @param name:revid type:int require:1 desc:art_rev_id文章审稿实例id
* @param name:human type:string require:1 desc:(reviewer/editor)
*/
- public function getartrevdate() {
+ public function getartrevdate()
+ {
//接受参数
$data = $this->request->post();
//查询实例数据
$res = $this->article_reviewer_obj->field('t_journal.*,t_article_reviewer.*,t_article.abstrart,t_article.title article_title,t_article.type atype,t_article.state astate,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();
+ ->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();
//文章类型转译
$res['atype'] = translateType($res['atype']);
//更改实例状态（消息提醒）
@@ -489,15 +505,16 @@ class Reviewer extends Controller {
* @param name:articleId type:int require:1 desc:文章id
* @param name:uid type:int require:1 desc:用户id
*/
- public function addArticleReviewer() {
+ public function addArticleReviewer()
+ {
//接收参数，查询数据
$data = $this->request->post();
$article_info = $this->article_obj->where('article_id', $data['articleId'])->find();
$reviewer_info = $this->user_obj
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_user.user_id", "left")
- ->where('t_user.user_id', $data['uid'])
- ->find();
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_user.user_id", "left")
+ ->where('t_user.user_id', $data['uid'])
+ ->find();
$journal_info = $this->journal_obj->where('journal_id', $article_info['journal_id'])->find();
//增加信息到文章审稿表
@@ -512,9 +529,9 @@ class Reviewer extends Controller {
$tt .= 'Dear Dr. ' . ($reviewer_info['realname'] == '' ? $reviewer_info["account"] : $reviewer_info['realname']) . '
';
$tt .= 'The manuscript entitled “' . $article_info['title'] . '” has'
- . ' been submitted to the journal ' . $journal_info['title'] . '. The Editor-in-Chief would'
- . ' be most grateful if you could offer an opinion regarding its suitability for publication'
- . ' in the journal ' . $journal_info['title'] . '.
';
+ . ' been submitted to the journal ' . $journal_info['title'] . '. The Editor-in-Chief would'
+ . ' be most grateful if you could offer an opinion regarding its suitability for publication'
+ . ' in the journal ' . $journal_info['title'] . '.
';
$tt .= 'Please bring into our knowledge if there is any potential Conflict of Interest. If you agree to review this manuscript, we ask you to complete your review and submit it by submission system within 10 days of receipt of the manuscript.
';
$tt .= 'Thank you for your consideration.
Look forward for your reply.
';
$tt .= 'Click here to review the article
';
@@ -526,17 +543,17 @@ class Reviewer extends Controller {
$tt .= 'Email:' . $journal_info['email'] . '
';
$tt .= 'Website:' . $journal_info['website'];
- $sendEditor=[
- 'title'=>$journal_info['title'], // 邮件标题
- 'content'=>$tt,//邮件内容
- 'user_id'=>$reviewer_info['user_id'], //收件人ID
- 'email'=>$reviewer_info['email'],// 收件人邮箱
- 'journal_id'=>$journal_info['journal_id'], // 期刊ID
- 'sendEmail'=>$journal_info['email'], // 期刊邮箱
- 'sendPassword'=>$journal_info['epassword'], // 期刊密码
- 'from_name'=>$journal_info['title']
+ $sendEditor = [
+ 'title' => $journal_info['title'], // 邮件标题
+ 'content' => $tt, //邮件内容
+ 'user_id' => $reviewer_info['user_id'], //收件人ID
+ 'email' => $reviewer_info['email'], // 收件人邮箱
+ 'journal_id' => $journal_info['journal_id'], // 期刊ID
+ 'sendEmail' => $journal_info['email'], // 期刊邮箱
+ 'sendPassword' => $journal_info['epassword'], // 期刊密码
+ 'from_name' => $journal_info['title']
];
- Queue::push('app\api\job\domail@fire',$sendEditor,'domail');
+ Queue::push('app\api\job\domail@fire', $sendEditor, 'domail');
//sendEmail($reviewer_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
return jsonSuccess([]);
}
@@ -550,12 +567,13 @@ class Reviewer extends Controller {
*
* @param name:article_id type:int require:1 desc:文章id
*/
- public function getArticleDetail() {
+ public function getArticleDetail()
+ {
$data = $this->request->post();
$info = $this->article_obj->field('t_article.*,t_journal.title journal_title')
- ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
- ->where('t_article.article_id', $data['article_id'])
- ->find();
+ ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
+ ->where('t_article.article_id', $data['article_id'])
+ ->find();
$major = $this->reviewer_major_obj->where('major_id', $info['major_id'])->find();
$cmajor = $this->reviewer_major_obj->where('major_id', $info['cmajor_id'])->find();
@@ -604,39 +622,40 @@ class Reviewer extends Controller {
* @param name:is_anonymous string require:1 desc:是否匿名0否1是
*
*/
- public function questionSubmit() {
+ public function questionSubmit()
+ {
//接受参数,查询基础数据
$data = $this->request->post();
-// $data['rev_qu_id'] = 3;
-// $data['art_rev_id'] = 23;
-// $data['qu1'] = 1;
-// $data['qu2'] = 2;
-// $data['qu3'] = 3;
-// $data['qu4'] = 1;
-// $data['qu5'] = 4;
-// $data['qu6'] = 2;
-// $data['qu7'] = 3;
-// $data['qu8'] = 1;
-// $data['qu9'] = 2;
-// $data['qu9contents'] = '';
-// $data['qu10'] = 'true';
-// $data['qu10contents'] = '';
-// $data['qu11'] = 'true';
-// $data['qu11contents'] = '';
-// $data['qu12'] = 'true';
-// $data['qu12contents'] = '';
-// $data['qu13'] = 'true';
-// $data['qu13contents'] = '';
-// $data['qu14'] = 'true';
-// $data['qu14contents'] = '';
-// $data['qu15'] = 'true';
-// $data['qu15contents'] = '';
-// $data['rated'] = 7;
-// $data['recommend'] = 2;
-// $data['other'] = 1;
-// $data['confident'] = 'contetn1';
-// $data['comment'] = 'contetsdasd';
+ // $data['rev_qu_id'] = 3;
+ // $data['art_rev_id'] = 23;
+ // $data['qu1'] = 1;
+ // $data['qu2'] = 2;
+ // $data['qu3'] = 3;
+ // $data['qu4'] = 1;
+ // $data['qu5'] = 4;
+ // $data['qu6'] = 2;
+ // $data['qu7'] = 3;
+ // $data['qu8'] = 1;
+ // $data['qu9'] = 2;
+ // $data['qu9contents'] = '';
+ // $data['qu10'] = 'true';
+ // $data['qu10contents'] = '';
+ // $data['qu11'] = 'true';
+ // $data['qu11contents'] = '';
+ // $data['qu12'] = 'true';
+ // $data['qu12contents'] = '';
+ // $data['qu13'] = 'true';
+ // $data['qu13contents'] = '';
+ // $data['qu14'] = 'true';
+ // $data['qu14contents'] = '';
+ // $data['qu15'] = 'true';
+ // $data['qu15contents'] = '';
+ // $data['rated'] = 7;
+ // $data['recommend'] = 2;
+ // $data['other'] = 1;
+ // $data['confident'] = 'contetn1';
+ // $data['comment'] = 'contetsdasd';
$art_rev_info = $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->find();
$article_info = $this->article_obj->where('article_id', $art_rev_info['article_id'])->find();
@@ -652,19 +671,19 @@ class Reviewer extends Controller {
$insert_data['qu6'] = $data['qu6'];
$insert_data['qu7'] = $data['qu7'];
$insert_data['qu8'] = $data['qu8'];
- $insert_data['qu9'] = $data['qu9']=="true" ? 1 : 0;
+ $insert_data['qu9'] = $data['qu9'] == "true" ? 1 : 0;
$insert_data['qu9_contents'] = $data['qu9contents'];
- $insert_data['qu10'] = $data['qu10']=="true" ? 1 : 0;
+ $insert_data['qu10'] = $data['qu10'] == "true" ? 1 : 0;
$insert_data['qu10_contents'] = $data['qu10contents'];
- $insert_data['qu11'] = $data['qu11']=="true" ? 1 : 0;
+ $insert_data['qu11'] = $data['qu11'] == "true" ? 1 : 0;
$insert_data['qu11_contents'] = $data['qu11contents'];
- $insert_data['qu12'] = $data['qu12']=="true" ? 1 : 0;
+ $insert_data['qu12'] = $data['qu12'] == "true" ? 1 : 0;
$insert_data['qu12_contents'] = $data['qu12contents'];
- $insert_data['qu13'] = $data['qu13']=="true" ? 1 : 0;
+ $insert_data['qu13'] = $data['qu13'] == "true" ? 1 : 0;
$insert_data['qu13_contents'] = $data['qu13contents'];
- $insert_data['qu14'] = $data['qu14']=="true" ? 1 : 0;
+ $insert_data['qu14'] = $data['qu14'] == "true" ? 1 : 0;
$insert_data['qu14_contents'] = $data['qu14contents'];
- $insert_data['qu15'] = $data['qu15']=="true" ? 1 : 0;
+ $insert_data['qu15'] = $data['qu15'] == "true" ? 1 : 0;
$insert_data['qu15_contents'] = $data['qu15contents'];
$insert_data['rated'] = $data['rated'];
$insert_data['recommend'] = $data['recommend'];
@@ -672,10 +691,10 @@ class Reviewer extends Controller {
$insert_data['confidential'] = $data['confident'];
$insert_data['comments'] = $data['comment'];
$insert_data['is_anonymous'] = isset($data['is_anonymous']) ? $data['is_anonymous'] : 0;
- if ($data['rev_qu_id'] == '') {//新增
+ if ($data['rev_qu_id'] == '') { //新增
$insert_data['ctime'] = time();
$res = $this->article_reviewer_question_obj->insert($insert_data);
- } else {//更新
+ } else { //更新
$res = $this->article_reviewer_question_obj->where('rev_qu_id', $data['rev_qu_id'])->update($insert_data);
}
@@ -695,7 +714,7 @@ class Reviewer extends Controller {
//记录log
//生成pdf文件
-// $reviewer_pdf = self::pdftest($journal_info['title']);
+ // $reviewer_pdf = self::pdftest($journal_info['title']);
$reviewer_ZS = self::createReviewerZS($data['art_rev_id']);
//发送email->编辑
@@ -703,17 +722,17 @@ class Reviewer extends Controller {
$tt .= 'Please check the new comments from the reviewer.
';
$tt .= 'Journal:' . $journal_info['title'] . ' and article title:' . $article_info['title'];
- $sendEditor=[
- 'title'=>$journal_info['title'], // 邮件标题
- 'content'=>$tt,//邮件内容
- 'user_id'=>$journal_info['editor_id'], //收件人ID
- 'email'=>$editor_info['email'],// 收件人邮箱
- 'journal_id'=>$journal_info['journal_id'], // 期刊ID
- 'sendEmail'=>$journal_info['email'], // 期刊邮箱
- 'sendPassword'=>$journal_info['epassword'], // 期刊密码
- 'from_name'=>$journal_info['title']
+ $sendEditor = [
+ 'title' => $journal_info['title'], // 邮件标题
+ 'content' => $tt, //邮件内容
+ 'user_id' => $journal_info['editor_id'], //收件人ID
+ 'email' => $editor_info['email'], // 收件人邮箱
+ 'journal_id' => $journal_info['journal_id'], // 期刊ID
+ 'sendEmail' => $journal_info['email'], // 期刊邮箱
+ 'sendPassword' => $journal_info['epassword'], // 期刊密码
+ 'from_name' => $journal_info['title']
];
- Queue::push('app\api\job\domail@fire',$sendEditor,'domail');
+ Queue::push('app\api\job\domail@fire', $sendEditor, 'domail');
//sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//发送email感谢reviewer并携带附件
@@ -723,18 +742,18 @@ class Reviewer extends Controller {
$tt1 .= 'Contact us
TMR Publishing Group Address: 11 Cockle Bay Rd, Cockle Bay, Auckland 2014, New Zealand
Telephone: +64 02108293806
E-mail: publisher@tmrjournals.com';
- $sendReviewer=[
- 'title'=>'Your contribution is greatly appreciated', // 邮件标题
- 'content'=>$tt1,//邮件内容
- 'user_id'=>$reviewer_info['user_id'], //收件人ID
- 'email'=>$reviewer_info['email'],// 收件人邮箱
- 'journal_id'=>$journal_info['journal_id'], // 期刊ID
- 'sendEmail'=>$journal_info['email'], // 期刊邮箱
- 'sendPassword'=>$journal_info['epassword'], // 期刊密码
- 'from_name'=>$journal_info['title'],
- 'attachment_url'=>$reviewer_ZS
+ $sendReviewer = [
+ 'title' => 'Your contribution is greatly appreciated', // 邮件标题
+ 'content' => $tt1, //邮件内容
+ 'user_id' => $reviewer_info['user_id'], //收件人ID
+ 'email' => $reviewer_info['email'], // 收件人邮箱
+ 'journal_id' => $journal_info['journal_id'], // 期刊ID
+ 'sendEmail' => $journal_info['email'], // 期刊邮箱
+ 'sendPassword' => $journal_info['epassword'], // 期刊密码
+ 'from_name' => $journal_info['title'],
+ 'attachment_url' => $reviewer_ZS
];
- Queue::push('app\api\job\domail@fire',$sendReviewer,'domail');
+ Queue::push('app\api\job\domail@fire', $sendReviewer, 'domail');
//sendEmail($reviewer_info['email'], 'Your contribution is greatly appreciated', $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword'], $reviewer_ZS);
//记录usermsg
@@ -743,15 +762,16 @@ class Reviewer extends Controller {
return json(['code' => 0]);
}
-// public function jpg_test(){
-// $reviewer_ZS = self::createReviewerZS(3380);
-// sendEmail("1586428462@qq.com", "title", "ttttt", "content", 'tmr@tmrjournals.com', "Wu9999999999", $reviewer_ZS);
-// }
+ // public function jpg_test(){
+ // $reviewer_ZS = self::createReviewerZS(3380);
+ // sendEmail("1586428462@qq.com", "title", "ttttt", "content", 'tmr@tmrjournals.com', "Wu9999999999", $reviewer_ZS);
+ // }
/**
* 获取问卷详情
*/
- public function getQuestion() {
+ public function getQuestion()
+ {
$id = $this->request->post('artrevid');
$qu_info = $this->article_reviewer_question_obj->where('art_rev_id', $id)->find();
if ($qu_info) {
@@ -764,7 +784,8 @@ class Reviewer extends Controller {
/**
* 上传文章的文件
*/
- public function up_file($type) {
+ public function up_file($type)
+ {
$file = request()->file($type);
if ($file) {
$info = $file->move(ROOT_PATH . 'public' . DS . $type);
@@ -787,7 +808,8 @@ class Reviewer extends Controller {
*
* @return upurl:图片地址
*/
- public function up_cv_file() {
+ public function up_cv_file()
+ {
$file = request()->file('reviewerCV');
if ($file) {
$info = $file->move(ROOT_PATH . 'public' . DS . 'reviewer');
@@ -814,7 +836,8 @@ class Reviewer extends Controller {
* @return articles:文章列表#
* @return count:总数#
*/
- public function getAllReviewerList() {
+ public function getAllReviewerList()
+ {
$data = $this->request->post();
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$artids = $this->article_reviewer_obj->where('reviewer_id', $data['user_id'])->column('article_id');
@@ -822,22 +845,22 @@ class Reviewer extends Controller {
if ($data['journal_id'] == 0) {
$journals = $this->reviewer_to_journal_obj->where('reviewer_id', $data['user_id'])->column('journal_id');
$arts = $this->article_obj
- ->field("t_article.*,t_article.major_id,t_article.abstrart,t_article.cmajor_id,t_journal.title journal_title")
- ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
- ->where('t_article.state', 2)
- ->where('t_article.article_id', 'not in', $artids)
- ->where('t_article.journal_id', 'in', $journals)
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->field("t_article.*,t_article.major_id,t_article.abstrart,t_article.cmajor_id,t_journal.title journal_title")
+ ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
+ ->where('t_article.state', 2)
+ ->where('t_article.article_id', 'not in', $artids)
+ ->where('t_article.journal_id', 'in', $journals)
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
$count = $this->article_obj->where('state', 2)->where('article_id', 'not in', $artids)->where('journal_id', 'in', $journals)->count();
} else {
$arts = $this->article_obj
- ->field("t_article.*,t_article.major_id,t_article.abstrart,t_article.cmajor_id,t_journal.title journal_title")
- ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
- ->where('t_article.journal_id', $data['journal_id'])
- ->where('t_article.article_id', 'not in', $artids)
- ->where('t_article.state', 2)
- ->limit($limit_start, $data['pageSize'])->select();
+ ->field("t_article.*,t_article.major_id,t_article.abstrart,t_article.cmajor_id,t_journal.title journal_title")
+ ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
+ ->where('t_article.journal_id', $data['journal_id'])
+ ->where('t_article.article_id', 'not in', $artids)
+ ->where('t_article.state', 2)
+ ->limit($limit_start, $data['pageSize'])->select();
$count = $this->article_obj->where('journal_id', $data['journal_id'])->where('article_id', 'not in', $artids)->where('state', 2)->count();
}
foreach ($arts as $k => $v) {
@@ -866,47 +889,49 @@ class Reviewer extends Controller {
*
* @param name:art_rev_id type:int require:1 desc:文章审稿实例id
*/
- public function getZSimg() {
+ public function getZSimg()
+ {
$data = $this->request->post();
$art_rev_info = $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->find();
$article_info = $this->article_obj->where('article_id', $art_rev_info['article_id'])->find();
-// if($article_info['rtime']==0){
-// return jsonError('Certificate not issued');
-// }
+ // if($article_info['rtime']==0){
+ // return jsonError('Certificate not issued');
+ // }
if (!file_exists(ROOT_PATH . 'public' . DS . 'reviewerZS' . DS . $data['art_rev_id'] . '.jpg')) {
$this->createZS($data['art_rev_id']);
}
$re['icon'] = 'reviewerZS' . DS . $data['art_rev_id'] . '.jpg';
return jsonSuccess($re);
}
-
-
-
-
+
+
+
+
/**
* 创建证书方法
*/
- private function createZS($art_rev_id) {
+ private function createZS($art_rev_id)
+ {
$art_rev_info = $this->article_reviewer_obj->where('art_rev_id', $art_rev_id)->find();
$reviewer_info = $this->user_obj->where('user_id', $art_rev_info['reviewer_id'])->find();
$article_info = $this->article_obj->where('article_id', $art_rev_info['article_id'])->find();
$journal_info = $this->journal_obj->where('journal_id', $article_info['journal_id'])->find();
-// $url = 'http://journalapi.tmrjournals.com/public/index.php/master/Journal/getJournalIcon';
-// $res = object_to_array(json_decode(myPost($url, ['issn'=>$journal_info['issn']])));
-// $img = 'http://journalapi.tmrjournals.com/public/journalicon/'.$res['data']['icon'];
+ // $url = 'http://journalapi.tmrjournals.com/public/index.php/master/Journal/getJournalIcon';
+ // $res = object_to_array(json_decode(myPost($url, ['issn'=>$journal_info['issn']])));
+ // $img = 'http://journalapi.tmrjournals.com/public/journalicon/'.$res['data']['icon'];
$template = ROOT_PATH . 'public' . DS . 'reviewerZS' . DS . 'zs.jpg';
$ziti = ROOT_PATH . 'public' . DS . 'zhengshu' . DS . 'siyuan.ttf';
$image = \think\Image::open($template);
$image->text($journal_info['title'], $ziti, 70, '#000000', [1450, 950])
- ->text($reviewer_info['realname'] == '' ? $reviewer_info['account'] : $reviewer_info['realname'], $ziti, 60, '#000000', [1900, 1700])
- ->text('awarded ' . date('d, F, Y', $article_info['rtime'] == 0 ? $article_info['ctime'] : $article_info['rtime']) . ' to', $ziti, 60, '#000000', [1600, 1500])
- ->text('In recognition of the review made for the journal', $ziti, 80, '#000000', [900, 1900])
- ->text('The Editors of', $ziti, 65, '#000000', [230, 2345])
- ->text($journal_info['title'], $ziti, 60, '#000000', [830, 2345])
- ->text('Cockle Bay Rd, Auckland, New Zealand, 2014', $ziti, 60, '#000000', [230, 2500])
- ->save(ROOT_PATH . 'public' . DS . 'reviewerZS' . DS . $art_rev_id . '.jpg');
+ ->text($reviewer_info['realname'] == '' ? $reviewer_info['account'] : $reviewer_info['realname'], $ziti, 60, '#000000', [1900, 1700])
+ ->text('awarded ' . date('d, F, Y', $article_info['rtime'] == 0 ? $article_info['ctime'] : $article_info['rtime']) . ' to', $ziti, 60, '#000000', [1600, 1500])
+ ->text('In recognition of the review made for the journal', $ziti, 80, '#000000', [900, 1900])
+ ->text('The Editors of', $ziti, 65, '#000000', [230, 2345])
+ ->text($journal_info['title'], $ziti, 60, '#000000', [830, 2345])
+ ->text('Cockle Bay Rd, Auckland, New Zealand, 2014', $ziti, 60, '#000000', [230, 2500])
+ ->save(ROOT_PATH . 'public' . DS . 'reviewerZS' . DS . $art_rev_id . '.jpg');
}
/**
@@ -920,7 +945,8 @@ class Reviewer extends Controller {
* @param name:user_id type:int require:1 desc:发起者userid
*
*/
- public function launchReviewer() {
+ public function launchReviewer()
+ {
$data = $this->request->post();
@@ -949,9 +975,9 @@ class Reviewer extends Controller {
$tt = $article_info['accept_sn'] . '
';
$tt .= 'Dear Dr. ' . ($user_info['realname'] == '' ? $user_info['account'] : $user_info['realname']) . '
';
$tt .= 'The manuscript entitled “' . $article_info['title'] . '” has'
- . ' been submitted to the journal ' . $journal_info['title'] . '. The Editor-in-Chief would'
- . ' be most grateful if you could offer an opinion regarding its suitability for publication'
- . ' in the journal ' . $journal_info['title'] . '.
';
+ . ' been submitted to the journal ' . $journal_info['title'] . '. The Editor-in-Chief would'
+ . ' be most grateful if you could offer an opinion regarding its suitability for publication'
+ . ' in the journal ' . $journal_info['title'] . '.
';
$tt .= 'Please bring into our knowledge if there is any potential Conflict of Interest. If you agree to review this manuscript, we ask you to complete your review and submit it by submission system within 10 days of receipt of the manuscript.
';
$tt .= 'Thank you for your consideration.
Look forward for your reply.
';
$tt .= 'Click here to review the article
';
@@ -963,17 +989,17 @@ class Reviewer extends Controller {
$tt .= 'Email:' . $journal_info['email'] . '
';
$tt .= 'Website:' . $journal_info['website'];
- $sendReviewer=[
- 'title'=>$journal_info['title'], // 邮件标题
- 'content'=>$tt,//邮件内容
- 'user_id'=>$user_info['user_id'], //收件人ID
- 'email'=>$user_info['email'],// 收件人邮箱
- 'journal_id'=>$journal_info['journal_id'], // 期刊ID
- 'sendEmail'=>$journal_info['email'], // 期刊邮箱
- 'sendPassword'=>$journal_info['epassword'], // 期刊密码
- 'from_name'=>$journal_info['title']
+ $sendReviewer = [
+ 'title' => $journal_info['title'], // 邮件标题
+ 'content' => $tt, //邮件内容
+ 'user_id' => $user_info['user_id'], //收件人ID
+ 'email' => $user_info['email'], // 收件人邮箱
+ 'journal_id' => $journal_info['journal_id'], // 期刊ID
+ 'sendEmail' => $journal_info['email'], // 期刊邮箱
+ 'sendPassword' => $journal_info['epassword'], // 期刊密码
+ 'from_name' => $journal_info['title']
];
- Queue::push('app\api\job\domail@fire',$sendReviewer,'domail');
+ Queue::push('app\api\job\domail@fire', $sendReviewer, 'domail');
//sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
@@ -981,7 +1007,8 @@ class Reviewer extends Controller {
return jsonSuccess($re);
}
- private function creatLoginUrlForreviewer($user, $article_id) {
+ private function creatLoginUrlForreviewer($user, $article_id)
+ {
$code = md5(time() . rand(1000, 9999) . 'thinkphp');
$insert['user_id'] = $user['user_id'];
$insert['code'] = $code;
@@ -1000,11 +1027,16 @@ class Reviewer extends Controller {
*
* @param name:art_rev_id type:int require:1 desc:文章审稿id
*/
- public function agreeReviewerArticle() {
+ public function agreeReviewerArticle()
+ {
$data = $this->request->post();
- $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->update(['state' => 0]);
-
- return jsonSuccess([]);
+ $art_rev_info = $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->find();
+ if ($art_rev_info['state'] == 5) {
+ $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->update(['state' => 0]);
+ return jsonSuccess([]);
+ } else {
+ return jsonError("Status changed fail");
+ }
}
/**
@@ -1016,21 +1048,26 @@ class Reviewer extends Controller {
*
* @param name:art_rev_id type:int require:1 desc:文章审稿id
*/
- public function refuseReviewerArticle() {
+ public function refuseReviewerArticle()
+ {
$data = $this->request->post();
- $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->update(['state' => 4]);
-
- //记录审稿失败次数
$art_rev_info = $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->find();
- $this->user_obj->where("user_id", $art_rev_info["reviewer_id"])->setInc("rd_num");
-
- return jsonSuccess([]);
+ if ($art_rev_info['state'] == 5) {
+ $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->update(['state' => 4]);
+ //记录审稿失败次数
+ $art_rev_info = $this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->find();
+ $this->user_obj->where("user_id", $art_rev_info["reviewer_id"])->setInc("rd_num");
+ return jsonSuccess([]);
+ } else {
+ return jsonError("Status changed fail");
+ }
}
/**
* 拒绝审稿get方法
*/
- public function refusereview($aid) {
+ public function refusereview($aid)
+ {
$art_rev_info = $this->article_reviewer_obj->where('art_rev_id', $aid)->find();
if ($art_rev_info == null) {
@@ -1053,15 +1090,16 @@ class Reviewer extends Controller {
*
* @param name:user_id type:int require:1 desc:审稿人id
*/
- public function getInvitatReviewList() {
+ public function getInvitatReviewList()
+ {
$data = $this->request->post();
$res = $this->article_reviewer_obj
- ->field("t_article_reviewer.art_rev_id,t_article.*,t_journal.title journal_title")
- ->join('t_article', 't_article.article_id = t_article_reviewer.article_id', 'left')
- ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
- ->where('t_article_reviewer.reviewer_id', $data['user_id'])
- ->where('t_article_reviewer.state', 5)
- ->select();
+ ->field("t_article_reviewer.art_rev_id,t_article.*,t_journal.title journal_title")
+ ->join('t_article', 't_article.article_id = t_article_reviewer.article_id', 'left')
+ ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
+ ->where('t_article_reviewer.reviewer_id', $data['user_id'])
+ ->where('t_article_reviewer.state', 5)
+ ->select();
foreach ($res as $k => $v) {
if ($v['type']) {
$res[$k]['type'] = translateType($v['type']);
@@ -1089,7 +1127,8 @@ class Reviewer extends Controller {
* @param name:article_id type:int require:1 desc:文章id
* @param name:user_id type:int require:1 desc:发起者userid
*/
- public function checkUserForReviewer() {
+ public function checkUserForReviewer()
+ {
$data = $this->request->post();
$re_res = $this->article_reviewer_obj->where('reviewer_id', $data['user_id'])->where('article_id', $data['article_id'])->find();
if ($re_res != null) {
@@ -1110,7 +1149,8 @@ class Reviewer extends Controller {
*
* @return has:no-has(无-有)#
*/
- public function checkUser() {
+ public function checkUser()
+ {
$data = $this->request->post();
$user_info = $this->user_obj->where('account|email', $data['account'])->find();
$has = '';
@@ -1122,7 +1162,7 @@ class Reviewer extends Controller {
$re['has'] = $has;
return jsonSuccess($re);
}
-
+
/**
* @title 检测用户是否是为某本期刊的审稿人
* @description 检测用户是否是为某本期刊的审稿人
@@ -1135,18 +1175,19 @@ class Reviewer extends Controller {
*
* @return has:是否存在(0不存在1存在)
*/
- public function checkReviewerOfJournal(){
+ public function checkReviewerOfJournal()
+ {
$data = $this->request->post();
- $user_info = $this->user_obj->where('account',$data['username'])->where('state',0)->find();
- if($user_info==null){
+ $user_info = $this->user_obj->where('account', $data['username'])->where('state', 0)->find();
+ if ($user_info == null) {
return jsonError("username error!!");
}
- $check = $this->reviewer_to_journal_obj->where("reviewer_id",$user_info['user_id'])->where('journal_id',$data['journal'])->where('state',0)->find();
-
- $re['has'] = $check==null?0:1;
+ $check = $this->reviewer_to_journal_obj->where("reviewer_id", $user_info['user_id'])->where('journal_id', $data['journal'])->where('state', 0)->find();
+
+ $re['has'] = $check == null ? 0 : 1;
return jsonSuccess($re);
}
-
+
/**
* @title 获取审稿人领域
* @description 获取审稿人领域
@@ -1158,12 +1199,13 @@ class Reviewer extends Controller {
*
* @return major:领域id(0:不存在)
*/
- public function getMajorForReviewer(){
+ public function getMajorForReviewer()
+ {
$data = $this->request->post();
- $user_info = $this->user_obj->where('account',$data['username'])->where('state',0)->find();
- $reviewer_info = $this->user_reviewer_info_obj->where("reviewer_id",$user_info['user_id'])->where('state',0)->find();
-
- $re["major"] = $reviewer_info==null?0:$reviewer_info['major'];
+ $user_info = $this->user_obj->where('account', $data['username'])->where('state', 0)->find();
+ $reviewer_info = $this->user_reviewer_info_obj->where("reviewer_id", $user_info['user_id'])->where('state', 0)->find();
+
+ $re["major"] = $reviewer_info == null ? 0 : $reviewer_info['major'];
return jsonSuccess($re);
}
@@ -1178,7 +1220,8 @@ class Reviewer extends Controller {
*
* @return majors:专业列表#
*/
- public function getMajor() {
+ public function getMajor()
+ {
$data = $this->request->post();
$majors = $this->reviewer_major_obj->where('pid', $data['pid'])->where('state', 0)->select();
$re['majors'] = $majors;
@@ -1194,7 +1237,8 @@ class Reviewer extends Controller {
*
* @return majors:专业列表#
*/
- public function getAllMajor() {
+ public function getAllMajor()
+ {
$majors = $this->reviewer_major_obj->where('pid', 0)->where('state', 0)->select();
foreach ($majors as $k => $v) {
$cmajors = $this->reviewer_major_obj->where('pid', $v['major_id'])->where('state', 0)->select();
@@ -1226,18 +1270,19 @@ class Reviewer extends Controller {
* @param name:company type:string require:0 desc:单位
* @param name:cv type:string require:1 desc:审稿人简历
*/
- public function addReviewer() {
+ public function addReviewer()
+ {
$data = $this->request->post();
-// $data['account'] = "wjl";
-// $data['cmajor'] = "36";
-// $data['country'] = "China";
-// $data['email'] = "wjl@126.com";
-// $data['gender'] = "2";
-// $data['journal_id'] = "1";
-// $data['major'] = "3";
-// $data['title'] = "Ph.D.";
-// $data['field'] = "123454";
+ // $data['account'] = "wjl";
+ // $data['cmajor'] = "36";
+ // $data['country'] = "China";
+ // $data['email'] = "wjl@126.com";
+ // $data['gender'] = "2";
+ // $data['journal_id'] = "1";
+ // $data['major'] = "3";
+ // $data['title'] = "Ph.D.";
+ // $data['field'] = "123454";
$check = $this->user_obj->where('account', trim($data['account']))->whereOr('email', $data['email'])->find();
if ($check != null) {
@@ -1276,16 +1321,16 @@ class Reviewer extends Controller {
if ($uid && $res1 && $res2) {
Db::commit();
//发送邮件通知审稿人
-// $content = "Please find your following username and original password. Editorial team thank you for your supprot.
";
-// $content .= 'Submission System
';
-// $content .= 'username:' . trim($data['account']) . '
';
-// $content .= 'Original Password: 123456qwe
';
-// $maidata['email'] = trim($data['email']);
-// $maidata['title'] = $journal_info['title'];
-// $maidata['content'] = $content;
-// $maidata['tmail'] = $journal_info['email'];
-// $maidata['tpassword'] = $journal_info['epassword'];
-// Queue::push('app\api\job\mail@fire', $maidata, "tmail");
+ // $content = "Please find your following username and original password. Editorial team thank you for your supprot.
";
+ // $content .= 'Submission System
';
+ // $content .= 'username:' . trim($data['account']) . '
';
+ // $content .= 'Original Password: 123456qwe
';
+ // $maidata['email'] = trim($data['email']);
+ // $maidata['title'] = $journal_info['title'];
+ // $maidata['content'] = $content;
+ // $maidata['tmail'] = $journal_info['email'];
+ // $maidata['tpassword'] = $journal_info['epassword'];
+ // Queue::push('app\api\job\mail@fire', $maidata, "tmail");
return jsonSuccess([]);
} else {
Db::rollback();
@@ -1312,7 +1357,8 @@ class Reviewer extends Controller {
* @param name:company type:string require:0 desc:单位
* @param name:cv type:string require:1 desc:审稿人简历
*/
- public function addReviewerBee() {
+ public function addReviewerBee()
+ {
$data = $this->request->post();
$journal_info = $this->journal_obj->where('journal_id', $data['journal_id'])->find();
$user_info = $this->user_obj->where('user_id', $data['user_id'])->where('state', 0)->find();
@@ -1363,9 +1409,10 @@ class Reviewer extends Controller {
* @param name:company type:string require:0 desc:单位
* @param name:cv type:string require:1 desc:审稿人简历
*/
- public function editReviewerForEditor() {
+ public function editReviewerForEditor()
+ {
$data = $this->request->post();
-// $info_insert['reviewer_id'] = $data['user_id'];
+ // $info_insert['reviewer_id'] = $data['user_id'];
$info_insert['technical'] = $data['title'];
$info_insert['introduction'] = isset($data['introduction']) ? trim($data['introduction']) : '';
$info_insert['company'] = isset($data['company']) ? trim($data['company']) : '';
@@ -1376,25 +1423,25 @@ class Reviewer extends Controller {
$this->user_reviewer_info_obj->where("reviewer_id", $data['user_id'])->update($info_insert);
return jsonSuccess([]);
}
-
-
-// public function addtest(){
-// $list = $this->reviewer_to_journal_obj
-// ->field("t_reviewer_to_journal.*,t_user_reviewer_info.reviewer_info_id")
-// ->join("t_user_reviewer_info","t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id","left")
-// ->where("t_reviewer_to_journal.state",0)
-// ->select();
-// echo '';
-//
-// foreach ($list as $v){
-// if($v['reviewer_info_id']!=null){
-// continue;
-// }
-// var_dump($v);
-// }
-//
-// echo '';
-// }
+
+
+ // public function addtest(){
+ // $list = $this->reviewer_to_journal_obj
+ // ->field("t_reviewer_to_journal.*,t_user_reviewer_info.reviewer_info_id")
+ // ->join("t_user_reviewer_info","t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id","left")
+ // ->where("t_reviewer_to_journal.state",0)
+ // ->select();
+ // echo '';
+ //
+ // foreach ($list as $v){
+ // if($v['reviewer_info_id']!=null){
+ // continue;
+ // }
+ // var_dump($v);
+ // }
+ //
+ // echo '';
+ // }
/**
* @title 获取审稿人列表
@@ -1409,7 +1456,8 @@ class Reviewer extends Controller {
* @param name:pageIndex type:int require:1 desc:开始页码
* @param name:pageSize type:int require:1 desc:每页是数据条数
*/
- public function getReviewerListByJournal() {
+ public function getReviewerListByJournal()
+ {
$data = $this->request->post();
$editor_info = $this->user_obj->where('account', $data['username'])->where('state', 0)->find();
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
@@ -1423,26 +1471,26 @@ class Reviewer extends Controller {
}
if (isset($data['keyword'])) {
$res = $this->reviewer_to_journal_obj
- ->field('t_reviewer_to_journal.is_yboard,t_user.*,t_user_reviewer_info.*,t_journal.title journal_title')
- ->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left')
- ->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left')
- ->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id', 'LEFT')
- ->where('t_reviewer_to_journal.journal_id', 'in', $jous)
- ->where('t_reviewer_to_journal.state', 0)
- ->where("t_user.account|t_user.realname|t_user.email","like",'%'.$data['keyword'].'%')
- ->limit($limit_start, $data['pageSize'])
- ->select();
- $count = $this->reviewer_to_journal_obj->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left')->where('t_reviewer_to_journal.journal_id', 'in', $jous)->where('t_reviewer_to_journal.state', 0)->where("t_user.account|t_user.realname|t_user.email","like",'%'.$data['keyword'].'%')->count();
- }else{
+ ->field('t_reviewer_to_journal.is_yboard,t_user.*,t_user_reviewer_info.*,t_journal.title journal_title')
+ ->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left')
+ ->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left')
+ ->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id', 'LEFT')
+ ->where('t_reviewer_to_journal.journal_id', 'in', $jous)
+ ->where('t_reviewer_to_journal.state', 0)
+ ->where("t_user.account|t_user.realname|t_user.email", "like", '%' . $data['keyword'] . '%')
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
+ $count = $this->reviewer_to_journal_obj->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left')->where('t_reviewer_to_journal.journal_id', 'in', $jous)->where('t_reviewer_to_journal.state', 0)->where("t_user.account|t_user.realname|t_user.email", "like", '%' . $data['keyword'] . '%')->count();
+ } else {
$res = $this->reviewer_to_journal_obj
- ->field('t_reviewer_to_journal.is_yboard,t_user.*,t_user_reviewer_info.*,t_journal.title journal_title')
- ->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left')
- ->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left')
- ->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id', 'LEFT')
- ->where('t_reviewer_to_journal.journal_id', 'in', $jous)
- ->where('t_reviewer_to_journal.state', 0)
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->field('t_reviewer_to_journal.is_yboard,t_user.*,t_user_reviewer_info.*,t_journal.title journal_title')
+ ->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left')
+ ->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left')
+ ->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id', 'LEFT')
+ ->where('t_reviewer_to_journal.journal_id', 'in', $jous)
+ ->where('t_reviewer_to_journal.state', 0)
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
$count = $this->reviewer_to_journal_obj->where('t_reviewer_to_journal.journal_id', 'in', $jous)->where('t_reviewer_to_journal.state', 0)->count();
}
return json(['code' => 0, 'data' => $res, 'total' => $count]);
@@ -1457,7 +1505,8 @@ class Reviewer extends Controller {
*
* @return countrys:国家列表#
*/
- public function getCountrys() {
+ public function getCountrys()
+ {
$res = $this->country_obj->order('en_name')->select();
$re['countrys'] = $res;
return json($re);
@@ -1474,15 +1523,16 @@ class Reviewer extends Controller {
*
* @return majors:领域列表#
*/
- public function getAllReviewerMajor() {
+ public function getAllReviewerMajor()
+ {
$data = $this->request->post();
$article_info = $this->article_obj->where("article_id", $data['article_id'])->find();
$ids = $this->reviewer_to_journal_obj
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where("t_reviewer_to_journal.state", 0)
- ->column("t_user_reviewer_info.major");
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where("t_reviewer_to_journal.state", 0)
+ ->column("t_user_reviewer_info.major");
$list = $this->reviewer_major_obj->where("major_id", "in", $ids)->where("state", 0)->select();
foreach ($list as $k => $v) {
@@ -1507,7 +1557,8 @@ class Reviewer extends Controller {
*
* @return reviewers:审稿人列表#
*/
- public function searchReviewer() {
+ public function searchReviewer()
+ {
$data = $this->request->post();
$article_info = $this->article_obj->where("article_id", $data['article_id'])->find();
$noids = $this->article_reviewer_obj->where('article_id', $data['article_id'])->column('reviewer_id');
@@ -1517,87 +1568,87 @@ class Reviewer extends Controller {
if ($data["keywords"] == "") {
if ($data["major_id"] == 0) {
$list = $this->reviewer_to_journal_obj
- ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
- ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where('t_reviewer_to_journal.state', 0)
- ->order("t_user.rs_num desc")
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
+ ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where('t_reviewer_to_journal.state', 0)
+ ->order("t_user.rs_num desc")
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
$count = $this->reviewer_to_journal_obj
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where('t_reviewer_to_journal.state', 0)
- ->count();
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where('t_reviewer_to_journal.state', 0)
+ ->count();
} else {
$list = $this->reviewer_to_journal_obj
- ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
- ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where("t_user_reviewer_info.major", $data['major_id'])
- ->where('t_reviewer_to_journal.state', 0)
- ->order("t_user.rs_num desc")
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
+ ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where("t_user_reviewer_info.major", $data['major_id'])
+ ->where('t_reviewer_to_journal.state', 0)
+ ->order("t_user.rs_num desc")
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
$count = $this->reviewer_to_journal_obj
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where("t_user_reviewer_info.major", $data['major_id'])
- ->where('t_reviewer_to_journal.state', 0)
- ->count();
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where("t_user_reviewer_info.major", $data['major_id'])
+ ->where('t_reviewer_to_journal.state', 0)
+ ->count();
}
} else {
if ($data["major_id"] == 0) {
$list = $this->reviewer_to_journal_obj
- ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
- ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
- ->where('t_reviewer_to_journal.state', 0)
- ->order("t_user.rs_num desc")
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
+ ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+ ->where('t_reviewer_to_journal.state', 0)
+ ->order("t_user.rs_num desc")
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
$count = $this->reviewer_to_journal_obj
- ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
- ->where('t_reviewer_to_journal.state', 0)
- ->count();
+ ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+ ->where('t_reviewer_to_journal.state', 0)
+ ->count();
} else {
$list = $this->reviewer_to_journal_obj
- ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
- ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where("t_user_reviewer_info.major", $data['major_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
- ->where('t_reviewer_to_journal.state', 0)
- ->order("t_user.rs_num desc")
- ->limit($limit_start, $data['pageSize'])
- ->select();
+ ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
+ ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where("t_user_reviewer_info.major", $data['major_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+ ->where('t_reviewer_to_journal.state', 0)
+ ->order("t_user.rs_num desc")
+ ->limit($limit_start, $data['pageSize'])
+ ->select();
$count = $this->reviewer_to_journal_obj
- ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
- ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
- ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
- ->where("t_user_reviewer_info.major", $data['major_id'])
- ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
- ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
- ->where('t_reviewer_to_journal.state', 0)
- ->count();
+ ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
+ ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
+ ->where("t_user_reviewer_info.major", $data['major_id'])
+ ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
+ ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+ ->where('t_reviewer_to_journal.state', 0)
+ ->count();
}
}
$re['reviewers'] = $list;
@@ -1616,15 +1667,16 @@ class Reviewer extends Controller {
*
* @return reviews:审稿列表#
*/
- public function getAllReviewerObj() {
+ public function getAllReviewerObj()
+ {
$data = $this->request->post();
$list = $this->article_reviewer_obj
- ->where("article_id", $data['article_id'])
- ->where("state", "in", [1, 2, 3])
- ->select();
+ ->where("article_id", $data['article_id'])
+ ->where("state", "in", [1, 2, 3])
+ ->select();
foreach ($list as $k => $v) {
$list[$k]["question"] = $this->article_reviewer_question_obj->where("art_rev_id", $v['art_rev_id'])->find();
- $list[$k]['reviewer'] = $this->user_obj->where("user_id",$v['reviewer_id'])->find();
+ $list[$k]['reviewer'] = $this->user_obj->where("user_id", $v['reviewer_id'])->find();
}
$re["reviews"] = $list;
@@ -1634,7 +1686,8 @@ class Reviewer extends Controller {
/**
* 存储reviewer文件历史信息
*/
- private function save_article_reviewer_file($art_rev_id, $user_id, $username, $url, $type_name) {
+ private function save_article_reviewer_file($art_rev_id, $user_id, $username, $url, $type_name)
+ {
//首先确定数据库里面是否存在此数据
$res = $this->article_reviewer_file_obj->where(['file_url' => $url])->find();
if ($res) {
@@ -1650,7 +1703,8 @@ class Reviewer extends Controller {
}
- private function createReviewerZS($art_rev_id) {
+ private function createReviewerZS($art_rev_id)
+ {
if (!file_exists(ROOT_PATH . 'public' . DS . 'reviewerZS' . DS . $art_rev_id . '.jpg')) {
$this->createZS($art_rev_id);
}
@@ -1660,43 +1714,43 @@ class Reviewer extends Controller {
/**
* 生成pdf感谢reviewer
*/
-// private function pdftest($title) {
-// $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
-// $pdf->SetHeaderData('logo.png', 25, '', '', array(0, 64, 255), array(0, 64, 128));
-// $pdf->setFooterData(array(0, 64, 0), array(0, 64, 128));
-// $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-// $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-// $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-// $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-// $pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
-// $pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
-// $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-// $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-// if (@file_exists(dirname(__FILE__) . '/lang/eng.php')) {
-// require_once(dirname(__FILE__) . '/lang/eng.php');
-// $pdf->setLanguageArray($l);
-// }
-// $pdf->setFontSubsetting(true);
-// $pdf->SetFont('times', '', 14, '', true);
-// $pdf->AddPage();
-// $pdf->setTextShadow(array('enabled' => true, 'depth_w' => 0.2, 'depth_h' => 0.2, 'color' => array(196, 196, 196), 'opacity' => 1, 'blend_mode' => 'Normal'));
-// $html = 'To whom it may concern
'
-// . 'You have reviewed 1 submission in the journal ' . $title . ' during ' . date('Y') . '
-//Thank you for your support to our journal. This contribution is greatly appreciated.'
-// . '
Regards
-//Editorial Office
-//' . $title . '
'
-// . '
Contact us
-//TMR Publishing Group Address: 11 Cockle Bay Rd, Cockle Bay, Auckland 2014, New Zealand
-//Telephone: +64 02108293806
-//E-mail: publisher@tmrjournals.com
To whom it may concern
'
+ // . 'You have reviewed 1 submission in the journal ' . $title . ' during ' . date('Y') . '
+ //Thank you for your support to our journal. This contribution is greatly appreciated.'
+ // . '
Regards
+ //Editorial Office
+ //' . $title . '
'
+ // . '
Contact us
+ //TMR Publishing Group Address: 11 Cockle Bay Rd, Cockle Bay, Auckland 2014, New Zealand
+ //Telephone: +64 02108293806
+ //E-mail: publisher@tmrjournals.com