1
This commit is contained in:
@@ -209,7 +209,8 @@ class Base extends Controller
|
|||||||
return $frag;
|
return $frag;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function delOneRefer($p_refer_id){
|
public function delOneRefer($p_refer_id)
|
||||||
|
{
|
||||||
|
|
||||||
$refer_info = $this->production_article_refer_obj->where('p_refer_id', $p_refer_id)->find();
|
$refer_info = $this->production_article_refer_obj->where('p_refer_id', $p_refer_id)->find();
|
||||||
if (!$refer_info) {
|
if (!$refer_info) {
|
||||||
@@ -291,6 +292,12 @@ class Base extends Controller
|
|||||||
return substr($frag, 0, -1);
|
return substr($frag, 0, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function MyaddEx()
|
||||||
|
{
|
||||||
|
$data = $this->request->post();
|
||||||
|
$this->addProductionEx($data['article_id']);
|
||||||
|
}
|
||||||
|
|
||||||
public function addProductionEx($article_id)
|
public function addProductionEx($article_id)
|
||||||
{
|
{
|
||||||
$check = $this->production_article_obj->where('article_id', $article_id)->where('state', 0)->find();
|
$check = $this->production_article_obj->where('article_id', $article_id)->where('state', 0)->find();
|
||||||
@@ -366,7 +373,8 @@ class Base extends Controller
|
|||||||
return jsonSuccess([]);
|
return jsonSuccess([]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getBoardsForJournal($journal_id,$aar=false){
|
public function getBoardsForJournal($journal_id, $aar = false)
|
||||||
|
{
|
||||||
$ca_board = [];
|
$ca_board = [];
|
||||||
$boards = $this->board_to_journal_obj
|
$boards = $this->board_to_journal_obj
|
||||||
->field("t_board_to_journal.*,t_board_group.group_name,t_user.account,t_user.email,t_user.realname,t_user.icon,t_user.google_index,t_user.google_time,t_user.wos_index,t_user.wos_time,t_user_reviewer_info.*")
|
->field("t_board_to_journal.*,t_board_group.group_name,t_user.account,t_user.email,t_user.realname,t_user.icon,t_user.google_index,t_user.google_time,t_user.wos_index,t_user.wos_time,t_user_reviewer_info.*")
|
||||||
@@ -529,7 +537,8 @@ class Base extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function getProductionMainImgs($p_article_id){
|
public function getProductionMainImgs($p_article_id)
|
||||||
|
{
|
||||||
$mains = $this->production_article_main_obj->where('p_article_id', $p_article_id)->where('state', 0)->select();
|
$mains = $this->production_article_main_obj->where('p_article_id', $p_article_id)->where('state', 0)->select();
|
||||||
if (count($mains) == 0) {
|
if (count($mains) == 0) {
|
||||||
$this->creatMainData($p_article_id);
|
$this->creatMainData($p_article_id);
|
||||||
@@ -556,7 +565,8 @@ class Base extends Controller
|
|||||||
return $frag;
|
return $frag;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function creatMainData($p_article_id){
|
private function creatMainData($p_article_id)
|
||||||
|
{
|
||||||
$p_info = $this->production_article_obj->where('p_article_id', $p_article_id)->find();
|
$p_info = $this->production_article_obj->where('p_article_id', $p_article_id)->find();
|
||||||
$article_info = $this->article_obj->where('article_id', $p_info['article_id'])->find();
|
$article_info = $this->article_obj->where('article_id', $p_info['article_id'])->find();
|
||||||
$files = $this->article_file_obj
|
$files = $this->article_file_obj
|
||||||
@@ -617,7 +627,8 @@ class Base extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function refuseReferIndex($p_article_id){
|
public function refuseReferIndex($p_article_id)
|
||||||
|
{
|
||||||
$p_info = $this->production_article_refer_obj->where('p_article_id', $p_article_id)->where('state', 0)->where('index', ">", 0)->find();
|
$p_info = $this->production_article_refer_obj->where('p_article_id', $p_article_id)->where('state', 0)->where('index', ">", 0)->find();
|
||||||
if ($p_info) {
|
if ($p_info) {
|
||||||
return;
|
return;
|
||||||
@@ -629,7 +640,8 @@ class Base extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function getProductionMainImgsByNew($p_article_id,$file){
|
public function getProductionMainImgsByNew($p_article_id, $file)
|
||||||
|
{
|
||||||
$p_info = $this->production_article_obj->where('p_article_id', $p_article_id)->find();
|
$p_info = $this->production_article_obj->where('p_article_id', $p_article_id)->find();
|
||||||
$article_info = $this->article_obj->where('article_id', $p_info['article_id'])->find();
|
$article_info = $this->article_obj->where('article_id', $p_info['article_id'])->find();
|
||||||
$url = "http://ts.tmrjournals.com/api/typeset/webReaddoc";
|
$url = "http://ts.tmrjournals.com/api/typeset/webReaddoc";
|
||||||
@@ -710,7 +722,8 @@ class Base extends Controller
|
|||||||
/**创建空production实例,应对main和refers
|
/**创建空production实例,应对main和refers
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function createEmptyProduction($web_article){
|
public function createEmptyProduction($web_article)
|
||||||
|
{
|
||||||
|
|
||||||
$insert['title'] = $web_article['title'];
|
$insert['title'] = $web_article['title'];
|
||||||
$insert['type'] = $web_article['type'];
|
$insert['type'] = $web_article['type'];
|
||||||
|
|||||||
@@ -921,7 +921,7 @@ class Reviewer extends Base
|
|||||||
|
|
||||||
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
|
//记录usermsg
|
||||||
add_usermsg($journal_info['editor_id'], 'Feedback questionnaire be uploaded.', '/articleReviewerDetail?id=' . $data['art_rev_id']);
|
add_usermsg($journal_info['editor_id'], 'Feedback questionnaire be uploaded:'.$article_info['accept_sn']."(".$reviewer_info['account'].":".$reviewer_info['email'].")", '/articleReviewerDetail?id=' . $data['art_rev_id']);
|
||||||
|
|
||||||
return json(['code' => 0]);
|
return json(['code' => 0]);
|
||||||
}
|
}
|
||||||
@@ -950,6 +950,7 @@ class Reviewer extends Base
|
|||||||
}
|
}
|
||||||
$repeat_info = $this->article_reviewer_repeat_obj->where('art_rev_rep_id',$data['art_rev_rep_id'])->find();
|
$repeat_info = $this->article_reviewer_repeat_obj->where('art_rev_rep_id',$data['art_rev_rep_id'])->find();
|
||||||
$art_info = $this->article_reviewer_obj->where('art_rev_id',$repeat_info['art_rev_id'])->find();
|
$art_info = $this->article_reviewer_obj->where('art_rev_id',$repeat_info['art_rev_id'])->find();
|
||||||
|
$reviewer_info = $this->user_obj->where('user_id',$art_info['reviewer_id'])->find();
|
||||||
$article_info = $this->article_obj->where('article_id',$art_info['article_id'])->find();
|
$article_info = $this->article_obj->where('article_id',$art_info['article_id'])->find();
|
||||||
$journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find();
|
$journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find();
|
||||||
$update['recommend'] = $data['recommend'];
|
$update['recommend'] = $data['recommend'];
|
||||||
@@ -969,7 +970,7 @@ class Reviewer extends Base
|
|||||||
//复审后发送邮件
|
//复审后发送邮件
|
||||||
|
|
||||||
//增加usermsg
|
//增加usermsg
|
||||||
add_usermsg($journal_info['editor_id'], 'New re_reviewer', '/articleReviewerDetail?id=' . $art_info['art_rev_id']);
|
add_usermsg($journal_info['editor_id'], 'New re_reviewer:'.$article_info['accept_sn']."(".$reviewer_info['account'].":".$reviewer_info['email'].")", '/articleReviewerDetail?id=' . $art_info['art_rev_id']);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1709,10 +1710,10 @@ class Reviewer extends Base
|
|||||||
->where('t_reviewer_to_journal.journal_id', 'in', $jous)
|
->where('t_reviewer_to_journal.journal_id', 'in', $jous)
|
||||||
->where($gradewhere)
|
->where($gradewhere)
|
||||||
->where('t_reviewer_to_journal.state', 0)
|
->where('t_reviewer_to_journal.state', 0)
|
||||||
->where("t_user.account|t_user.realname|t_user.email|t_user_reviewer_info.field", "like", '%' . $data['keyword'] . '%')
|
->where("t_user.account|t_user.email", "like", '%' . $data['keyword'] . '%')
|
||||||
->limit($limit_start, $data['pageSize'])
|
->limit($limit_start, $data['pageSize'])
|
||||||
->select();
|
->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', 'in', $jous)->where($gradewhere)->where('t_reviewer_to_journal.state', 0)->where("t_user.account|t_user.realname|t_user.email|t_user_reviewer_info.field", "like", '%' . $data['keyword'] . '%')->count();
|
$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', 'in', $jous)->where($gradewhere)->where('t_reviewer_to_journal.state', 0)->where("t_user.account|t_user.email", "like", '%' . $data['keyword'] . '%')->count();
|
||||||
} else {
|
} else {
|
||||||
$res = $this->reviewer_to_journal_obj
|
$res = $this->reviewer_to_journal_obj
|
||||||
->field('t_reviewer_to_journal.is_yboard,t_user.*,t_reviewer_to_journal.grade,t_user_reviewer_info.*,t_journal.journal_id,t_journal.title journal_title')
|
->field('t_reviewer_to_journal.is_yboard,t_user.*,t_reviewer_to_journal.grade,t_user_reviewer_info.*,t_journal.journal_id,t_journal.title journal_title')
|
||||||
|
|||||||
Reference in New Issue
Block a user