1
This commit is contained in:
@@ -328,7 +328,7 @@ class Article extends Base
|
||||
// $major_data['cmajor'] = null;
|
||||
// }
|
||||
//新领域查询
|
||||
$major = $this->getMajorStr($article_res['major_id']) == "" ? "" : substr($this->getMajorStr($article_res['major_id']), 3);
|
||||
$major = $this->getMajorStr($article_res['major_id']);
|
||||
|
||||
//查询文章作者信息
|
||||
$author_res = $this->article_author_obj->where('article_id', $data['articleId'])->where('state', 0)->select();
|
||||
@@ -1152,7 +1152,7 @@ class Article extends Base
|
||||
$tt .= '<a href="https://www.tmrjournals.com/draw_up.html?issn=' . $journal_info['issn'] . '">Subscribe to this journal</a><br>';
|
||||
$tt .= 'Email: ' . $journal_info['email'] . '<br>';
|
||||
$tt .= 'Website: ' . $journal_info['website'];
|
||||
if ($data['state'] != 5 || $journal_info['journal_id'] != 9) {
|
||||
// if ($data['state'] != 5) {//不接收的邮件发送
|
||||
$sendUser['content'] = $tt;
|
||||
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
|
||||
if ($data['state'] == 4) {
|
||||
@@ -1160,7 +1160,10 @@ class Article extends Base
|
||||
} else {
|
||||
sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
|
||||
}
|
||||
}
|
||||
// }else{//接收文章时应该发送到所有人上,包括所有作者和上传用户
|
||||
|
||||
|
||||
// }
|
||||
if ($data['state'] == 6) { //进入终审,通知主编邮件
|
||||
$chiefs = $this->chief_to_journal_obj->join('t_user', 't_user.user_id = t_chief_to_journal.user_id', 'left')->where('t_chief_to_journal.journal_id', $journal_info['journal_id'])->where('t_chief_to_journal.state', 0)->select();
|
||||
foreach ($chiefs as $v) {
|
||||
@@ -2051,7 +2054,11 @@ class Article extends Base
|
||||
$inser_data['email'] = trim($v['email']);
|
||||
$inser_data['realname'] = trim($v['firstname']) . ' ' . trim($v['lastname']);
|
||||
$inser_data['ctime'] = time();
|
||||
$this->user_obj->insertGetId($inser_data);
|
||||
$uid = $this->user_obj->insertGetId($inser_data);
|
||||
$iuri['reviewer_id'] = $uid;
|
||||
$iuri['country'] = $v['country'];
|
||||
$iuri['technical'] = $v['author_title'];
|
||||
$this->user_reviewer_info_obj->insert($iuri);
|
||||
|
||||
//发送提示邮件给通讯作者
|
||||
$report_tt = "Dear " . $inser_data['realname'] . ',<br/><br/>';
|
||||
@@ -2675,15 +2682,16 @@ class Article extends Base
|
||||
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
|
||||
$where['t_article_reviewer.article_id'] = $data['articleId'];
|
||||
$res = $this->article_reviewer_obj
|
||||
->field('t_article_reviewer.*,t_user.email,t_user.realname,t_user.account reviewer,t_user_reviewer_info.country country,t_user_reviewer_info.field,t_user_reviewer_info.company,t_reviewer_major.title major_title,t_reviewer_major.ctitle major_ctitle')
|
||||
->field('t_article_reviewer.*,t_user.email,t_user.realname,t_user.account reviewer,t_user_reviewer_info.country country,t_user_reviewer_info.field,t_user_reviewer_info.company,t_user_reviewer_info.major')
|
||||
->join('t_user', 't_article_reviewer.reviewer_id = t_user.user_id', 'LEFT')
|
||||
->join('t_user_reviewer_info', 't_article_reviewer.reviewer_id = t_user_reviewer_info.reviewer_id', 'LEFT')
|
||||
->join('t_reviewer_major', 't_reviewer_major.major_id = t_user_reviewer_info.major', 'LEFT')
|
||||
// ->join('t_reviewer_major', 't_reviewer_major.major_id = t_user_reviewer_info.major', 'LEFT')
|
||||
->where($where)->limit($limit_start, $data['pageSize'])->select();
|
||||
|
||||
|
||||
|
||||
$count = $this->article_reviewer_obj->where($where)->count();
|
||||
|
||||
foreach($res as $k => $v){
|
||||
$res[$k]['major_str'] = $this->getMajorStr($v['major']);
|
||||
}
|
||||
if ($res) {
|
||||
return json(['code' => 0, 'data' => $res, 'totle' => $count]);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user