This commit is contained in:
wangjinlei
2022-04-28 10:12:23 +08:00
parent de6ccd46ab
commit 4b5ba8b12e

View File

@@ -1189,13 +1189,13 @@ class Article extends Controller {
//修改文章状态->审稿中 //修改文章状态->审稿中
$this->article_obj->where('article_id',$data['articleId'])->update(['state'=>2]); $this->article_obj->where('article_id',$data['articleId'])->update(['state'=>2]);
//添加article_msg信息 // //添加article_msg信息
$insmsg_data['article_id'] = $data['articleId']; // $insmsg_data['article_id'] = $data['articleId'];
$insmsg_data['content'] = ''; // $insmsg_data['content'] = '';
$insmsg_data['state_from'] = $article_info['state']; // $insmsg_data['state_from'] = $article_info['state'];
$insmsg_data['state_to'] = 2; // $insmsg_data['state_to'] = 2;
$insmsg_data['ctime'] = time(); // $insmsg_data['ctime'] = time();
$this->article_msg_obj->insert($insmsg_data); // $this->article_msg_obj->insert($insmsg_data);
//发送email提醒审稿员 //发送email提醒审稿员
$tt = $article_info['accept_sn'] . '<br>'; $tt = $article_info['accept_sn'] . '<br>';
@@ -1216,17 +1216,6 @@ class Article extends Controller {
$tt .= $journal_info['title'].'<br>'; $tt .= $journal_info['title'].'<br>';
$tt .= 'Email:'.$journal_info['email'].'<br>'; $tt .= 'Email:'.$journal_info['email'].'<br>';
$tt .= 'Website:'.$journal_info['website']; $tt .= 'Website:'.$journal_info['website'];
$sendUser=[
'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',$sendUser,'domail');
sendEmail($reviewer_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($reviewer_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
@@ -1316,12 +1305,12 @@ class Article extends Controller {
$data = $this->request->post(); $data = $this->request->post();
// $data['journal'] = 1; // $data['journal'] = 1;
// $data['username'] = 'wangjinlei'; // $data['username'] = 'wangjinlei';
// $data['title'] = 'sadfsq11adf'; // $data['title'] = 'test';
// $data['major'] = 2; // $data['major'] = 52;
// $data['authorList'][0] = [ // $data['authorList'][0] = [
// 'firstname'=>'name1', // 'firstname'=>'name1',
// 'lastname'=>'name22', // 'lastname'=>'name22',
// 'orcid'=>'', // 'orcid'=>'fawradfsadf',
// 'company'=>'dsadsa', // 'company'=>'dsadsa',
// 'department'=>'name1', // 'department'=>'name1',
// 'title'=>'Assistant Prof.', // 'title'=>'Assistant Prof.',
@@ -1337,10 +1326,10 @@ class Article extends Controller {
// $data['istransfer']='false'; // $data['istransfer']='false';
// $data['becomeRev']='false'; // $data['becomeRev']='false';
// $data['keyWords']='sdfsfdf'; // $data['keyWords']='sdfsfdf';
// $data['fund']=''; // $data['fund']='adsada';
// $data['coverLetter']=''; // $data['coverLetter']='';
// $data['totalpage']=''; // $data['totalpage']='';
// $data['manuscirpt']='manuscirpt/20220420/7c9ffb7ff502ec6b6b7642fcba77fa63.rar'; // $data['manuscirpt']='manuscirpt/20220424/0bfc8f5675911c2389dcd22b65c7e20c.docx';
$user_res = $this->user_obj->where('account', $data['username'])->find(); $user_res = $this->user_obj->where('account', $data['username'])->find();
@@ -1363,9 +1352,6 @@ class Article extends Controller {
return json(['code'=>1,'msg'=>'Warning: you are re-submitting the article!']); return json(['code'=>1,'msg'=>'Warning: you are re-submitting the article!']);
} }
} }
Db::startTrans(); Db::startTrans();
//添加文章基础信息 //添加文章基础信息
@@ -1471,7 +1457,8 @@ class Article extends Controller {
//推荐审稿人 //推荐审稿人
$recommend_res = true; $recommend_res = true;
foreach($data['reviewers'] as $v){ $reviewers = isset($data['reviewers'])?$data['reviewers']:[];
foreach($reviewers as $v){
$recommend_res = $this->addRecommentReviewer($v,$journal_info['journal_id'],$user_res['user_id'],$res); $recommend_res = $this->addRecommentReviewer($v,$journal_info['journal_id'],$user_res['user_id'],$res);
} }