This commit is contained in:
wangjinlei
2023-01-29 17:41:11 +08:00
parent dbfc3c6452
commit b1b4704964
7 changed files with 1497 additions and 882 deletions

View File

@@ -617,6 +617,18 @@ class Reviewer extends Controller
return jsonSuccess($re);
}
public function getReviewerOnChina(){
$res = $this->user_obj
->field("t_user.email")
->join("t_user_reviewer_info","t_user_reviewer_info.reviewer_id = t_user.user_id","left")
->where('t_user_reviewer_info.country','China')
->whereOr('t_user_reviewer_info.country','中国')
->select();
$re['emails']=$res;
return jsonSuccess($re);
}
/**
* @title 提交问卷(审稿人)
* @description 提交问卷(审稿人)
@@ -1559,10 +1571,10 @@ class Reviewer extends Controller
->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", "like", '%' . $data['keyword'] . '%')
->where("t_user.account|t_user.realname|t_user.email|t_user_reviewer_info.field", "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($gradewhere)->where('t_reviewer_to_journal.state', 0)->where("t_user.account|t_user.realname|t_user.email", "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.realname|t_user.email|t_user_reviewer_info.field", "like", '%' . $data['keyword'] . '%')->count();
} else {
$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')