This commit is contained in:
wangjinlei
2022-02-28 10:00:50 +08:00
parent 4c6f6d97c1
commit 7b0edf5da5
6 changed files with 289 additions and 68 deletions

View File

@@ -137,12 +137,15 @@ class Reviewer extends Controller {
$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')
$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])
->order('t_article_reviewer.state')
->where("t_article.article_id",">",0)
// ->order('t_article_reviewer.state')
->limit($limit_start, $data['pageSize'])
->select();
foreach ($res as $k => $v) {
@@ -159,7 +162,7 @@ class Reviewer extends Controller {
$res[$k]['cmajor'] = $cmajor['title'];
}
$count = $this->article_reviewer_obj->where('reviewer_id', $reviewer_info['user_id'])->where('state', 'in', [1, 2, 3, 4])->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);
@@ -677,13 +680,13 @@ class Reviewer extends Controller {
$tt = 'Dear editor,<br>';
$tt .= 'Please check the new comments from the reviewer.<br>';
$tt .= 'Journal:' . $journal_info['title'] . ' and article title:' . $article_info['title'];
// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//发送email感谢reviewer并携带附件
$reviewer_info = $this->user_obj->where('user_id', $art_rev_info['reviewer_id'])->find();
$tt1 = 'You have reviewed 1 submission in the journal ' . $journal_info['title'] . ' during ' . date('Y') . '.Thank you for your support to our journal. This contribution is greatly appreciated.<br><br>';
$tt1 .= 'Regards<br>Editorial Office<br>' . $journal_info['title'] . '<br><br>';
$tt1 .= 'Contact us<br>TMR Publishing Group Address: 11 Cockle Bay Rd, Cockle Bay, Auckland 2014, New Zealand<br>Telephone: +64 02108293806<br>E-mail: publisher@tmrjournals.com';
// sendEmail($reviewer_info['email'], 'Your contribution is greatly appreciated', $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword'], $reviewer_ZS);
sendEmail($reviewer_info['email'], 'Your contribution is greatly appreciated', $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword'], $reviewer_ZS);
//记录usermsg
add_usermsg($journal_info['editor_id'], 'Feedback questionnaire be uploaded.', '/articleReviewerDetail?id=' . $data['art_rev_id']);
@@ -905,7 +908,7 @@ class Reviewer extends Controller {
$tt .= $journal_info['title'] . '<br>';
$tt .= 'Email:' . $journal_info['email'] . '<br>';
$tt .= 'Website:' . $journal_info['website'];
// sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
$re['art_rev_id'] = $res;
return jsonSuccess($re);
@@ -1306,6 +1309,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 '<pre>';
//
// foreach ($list as $v){
// if($v['reviewer_info_id']!=null){
// continue;
// }
// var_dump($v);
// }
//
// echo '</pre>';
// }
/**
* @title 获取审稿人列表
@@ -1531,10 +1553,11 @@ class Reviewer extends Controller {
$data = $this->request->post();
$list = $this->article_reviewer_obj
->where("article_id", $data['article_id'])
->where("state", "in", [2, 3])
->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();
}
$re["reviews"] = $list;