zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wangjinlei
2022-08-31 09:43:27 +08:00
parent 29c6b4c627
commit cbcd329ff9
5 changed files with 123 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/api/controller/Article.php
View File

@@ -37,6 +37,8 @@ class Article extends Controller {
protected $article_response_to_reviewer_obj = ''; protected $article_response_to_reviewer_obj = '';
protected $user_black_obj = ''; protected $user_black_obj = '';
protected $user_reviewer_recommend_obj = ''; protected $user_reviewer_recommend_obj = '';
protected $email_log_obj = '';
protected $email_template_obj = '';
public function __construct(\think\Request $request = null) { public function __construct(\think\Request $request = null) {
parent::__construct($request); parent::__construct($request);
@@ -64,6 +66,8 @@ class Article extends Controller {
$this->article_response_to_reviewer_obj = Db::name('article_response_to_reviewer'); $this->article_response_to_reviewer_obj = Db::name('article_response_to_reviewer');
$this->user_black_obj = Db::name('user_black'); $this->user_black_obj = Db::name('user_black');
$this->user_reviewer_recommend_obj = Db::name('user_reviewer_recommend'); $this->user_reviewer_recommend_obj = Db::name('user_reviewer_recommend');
$this->email_log_obj = Db::name('email_log');
$this->email_template_obj = Db::name('email_template');
} }
/** /**
@@ -211,6 +215,12 @@ class Article extends Controller {
$res[$k]['countrys'] = $cache_country; $res[$k]['countrys'] = $cache_country;
} }
//增加邮件历史记录
foreach($res as $k => $v){
$cache = $this->email_log_obj->where('article_id',$v['article_id'])->where('is_success',1)->select();
$res[$k]['emailh'] = $cache?1:0;
}
$count = $this->article_obj->where($where)->count(); $count = $this->article_obj->where($where)->count();
return json(['total' => $count, 'data' => $res]); return json(['total' => $count, 'data' => $res]);
@@ -987,6 +997,7 @@ class Article extends Controller {
$tt .= 'Please find the new comments in the "<a href="http://submission.tmrjournals.com/submission?journal='.$journal_info['alias'].'">Author Center</a>", Please submit your revised manuscript within two weeks.<br><br>'; $tt .= 'Please find the new comments in the "<a href="http://submission.tmrjournals.com/submission?journal='.$journal_info['alias'].'">Author Center</a>", Please submit your revised manuscript within two weeks.<br><br>';
$tt .= 'If you need more time to revise, you can send E-mial to tell us.<br>'; $tt .= 'If you need more time to revise, you can send E-mial to tell us.<br>';
$tt .= 'Sincerely,<br>Editorial Office<br>'; $tt .= 'Sincerely,<br>Editorial Office<br>';
$tt .= "Please also find the Manuscript Check List attached. Check and complete each item one by one. If you could put the completed form on the revised manuscript's last page, it would speed up the processing process of the manuscript. Please note that this is voluntary.<br><br>";
}else if($data['state']==6){//终审 }else if($data['state']==6){//终审
$tt = 'Dear Dr. '.($user_info['realname']==''?$user_info['account']:$user_info['realname']).'，<br>'; $tt = 'Dear Dr. '.($user_info['realname']==''?$user_info['account']:$user_info['realname']).'，<br>';
$tt .= 'Manuscript status: Your manuscript "'.$article_info['title'].'" is under reviewing by editorial member team of '.$journal_info['title'].'.'; $tt .= 'Manuscript status: Your manuscript "'.$article_info['title'].'" is under reviewing by editorial member team of '.$journal_info['title'].'.';
@@ -1003,7 +1014,12 @@ class Article extends Controller {
if($data['state']!=5||$journal_info['journal_id']!=9){ if($data['state']!=5||$journal_info['journal_id']!=9){
$sendUser['content'] = $tt; $sendUser['content'] = $tt;
// Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); if($data['state']==4){
sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword'],ROOT_PATH . 'public' . DS.'system'.DS.'Checklist.docx');
}else{
sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
}
} }
if($data['state']==6){//进入终审，通知主编邮件 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(); $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();

34
application/api/controller/Email.php
View File

@@ -136,6 +136,21 @@ class Email extends Controller{
return jsonSuccess($re); return jsonSuccess($re);
} }
/**
* 增加模板调用计数
*/
public function addEmailTemplateNum(){
$data = $this->request->post();
$rule = new Validate([
'eid'=>'require'
]);
if(!$rule->check($data)){
return jsonError($rule->getError());
}
$this->email_template_obj->where('eid',$data['eid'])->setInc('num');
return jsonSuccess([]);
}
/** /**
* 发送模板邮件 * 发送模板邮件
*/ */
@@ -168,8 +183,23 @@ class Email extends Controller{
} }
public function tttt(){ public function tttt(){
$str = "home".DS."ds".DS."12312321.jpg"; echo md5('zhengzuguo0614');
echo substr($str,strrpos($str,DS)+1); }
/**
* 获取邮件发送记录通过文章
*/
public function getEmailsByArticle(){
$data = $this->request->post();
$rule = new Validate([
'article_id'=>'require'
]);
if(!$rule->check($data)){
return jsonError($rule->getError());
}
$list = $this->email_log_obj->where('article_id',$data['article_id'])->where('is_success',1)->select();
$re['emails'] = $list;
return jsonSuccess($re);
} }

65
application/api/controller/Reviewer.php
View File

@@ -1455,6 +1455,7 @@ class Reviewer extends Controller
* @param name:major type:int require:1 desc:领域 * @param name:major type:int require:1 desc:领域
* @param name:cmajor type:int require:1 desc:子领域 * @param name:cmajor type:int require:1 desc:子领域
* @param name:field type:string require:1 desc:领域 * @param name:field type:string require:1 desc:领域
* @param name:realname type:string require:0 desc:真实姓名
* @param name:introduction type:string require:0 desc:简介 * @param name:introduction type:string require:0 desc:简介
* @param name:company type:string require:0 desc:单位 * @param name:company type:string require:0 desc:单位
* @param name:cv type:string require:1 desc:审稿人简历 * @param name:cv type:string require:1 desc:审稿人简历
@@ -1471,6 +1472,9 @@ class Reviewer extends Controller
$info_insert['field'] = trim($data['field']); $info_insert['field'] = trim($data['field']);
$info_insert['qualifications'] = trim($data['cv']); $info_insert['qualifications'] = trim($data['cv']);
$this->user_reviewer_info_obj->where("reviewer_id", $data['user_id'])->update($info_insert); $this->user_reviewer_info_obj->where("reviewer_id", $data['user_id'])->update($info_insert);
if(isset($data['realname'])&&$data['realname']!=''){
$this->user_obj->where('user_id',$data['user_id'])->update(['realname'=>$data['realname']]);
}
return jsonSuccess([]); return jsonSuccess([]);
} }
@@ -1503,6 +1507,7 @@ class Reviewer extends Controller
* @param name:username type:string require:1 desc:用户名 * @param name:username type:string require:1 desc:用户名
* @param name:keyword type:string require:0 desc:搜索账户名/email/真名 * @param name:keyword type:string require:0 desc:搜索账户名/email/真名
* @param name:journalId type:int require:1 desc:期刊id当全选时为0 * @param name:journalId type:int require:1 desc:期刊id当全选时为0
* @param name:grade type:string require:0 desc:审稿人评级
* @param name:pageIndex type:int require:1 desc:开始页码 * @param name:pageIndex type:int require:1 desc:开始页码
* @param name:pageSize type:int require:1 desc:每页是数据条数 * @param name:pageSize type:int require:1 desc:每页是数据条数
*/ */
@@ -1519,29 +1524,42 @@ class Reviewer extends Controller
} else { } else {
$jous[] = $data['journalId']; $jous[] = $data['journalId'];
} }
$gradewhere = '';
if(isset($data['grade'])){
$gradewhere = 't_reviewer_to_journal.grade = "'.$data['grade'].'"';
}
if (isset($data['keyword'])) { if (isset($data['keyword'])) {
$res = $this->reviewer_to_journal_obj $res = $this->reviewer_to_journal_obj
->field('t_reviewer_to_journal.is_yboard,t_user.*,t_user_reviewer_info.*,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')
->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left') ->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left')
->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left') ->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') ->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('t_reviewer_to_journal.journal_id', 'in', $jous)
->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", "like", '%' . $data['keyword'] . '%') ->where("t_user.account|t_user.realname|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')->where('t_reviewer_to_journal.journal_id', 'in', $jous)->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')->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();
} else { } else {
$res = $this->reviewer_to_journal_obj $res = $this->reviewer_to_journal_obj
->field('t_reviewer_to_journal.is_yboard,t_user.*,t_user_reviewer_info.*,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')
->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left') ->join('t_journal', 't_journal.journal_id = t_reviewer_to_journal.journal_id', 'left')
->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left') ->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') ->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('t_reviewer_to_journal.journal_id', 'in', $jous)
->where($gradewhere)
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->limit($limit_start, $data['pageSize']) ->limit($limit_start, $data['pageSize'])
->select(); ->select();
$count = $this->reviewer_to_journal_obj->where('t_reviewer_to_journal.journal_id', 'in', $jous)->where('t_reviewer_to_journal.state', 0)->count(); $count = $this->reviewer_to_journal_obj->where('t_reviewer_to_journal.journal_id', 'in', $jous)->where($gradewhere)->where('t_reviewer_to_journal.state', 0)->count();
}
foreach($res as $k => $v){
$major_res = $this->reviewer_major_obj->where('major_id', $v['major'])->column('title');
$res[$k]['major_title'] = $major_res ? $major_res[0] : '';
$cmajor_res = $this->reviewer_major_obj->where('major_id', $v['cmajor'])->column('title');
$res[$k]['cmajor_title'] = $cmajor_res ? $cmajor_res[0] : '';
} }
return json(['code' => 0, 'data' => $res, 'total' => $count]); return json(['code' => 0, 'data' => $res, 'total' => $count]);
} }
@@ -1562,6 +1580,24 @@ class Reviewer extends Controller
return json($re); return json($re);
} }
/**
* 修改审稿人评级
*/
public function editReviewerGrade(){
$data = $this->request->post();
$rule = new Validate([
'journal_id'=>'require|number',
'user_id'=>'require',
'grade'=>'require'
]);
if(!$rule->check($data)){
return jsonError($rule->getError());
}
$this->reviewer_to_journal_obj->where('journal_id',$data['journal_id'])
->where('reviewer_id',$data['user_id'])->where('state',0)->update(['grade'=>$data['grade']]);
return jsonSuccess([]);
}
/** /**
* @title 获取期刊审稿人范围内全部领域 * @title 获取期刊审稿人范围内全部领域
* @description 获取期刊审稿人范围内全部领域 * @description 获取期刊审稿人范围内全部领域
@@ -1602,6 +1638,7 @@ class Reviewer extends Controller
* @param name:article_id type:int require:1 desc:文章id * @param name:article_id type:int require:1 desc:文章id
* @param name:major_id type:int require:1 desc:领域id * @param name:major_id type:int require:1 desc:领域id
* @param name:keywords type:string require:1 desc:关键词 * @param name:keywords type:string require:1 desc:关键词
* @param name:grade type:string require:0 desc:评级
* @param name:pageIndex type:int require:1 desc:当前页码数 * @param name:pageIndex type:int require:1 desc:当前页码数
* @param name:pageSize type:int require:1 desc:单页数据条数 * @param name:pageSize type:int require:1 desc:单页数据条数
* *
@@ -1614,16 +1651,21 @@ class Reviewer extends Controller
$noids = $this->article_reviewer_obj->where('article_id', $data['article_id'])->column('reviewer_id'); $noids = $this->article_reviewer_obj->where('article_id', $data['article_id'])->column('reviewer_id');
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize']; $limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$list = []; $list = [];
$gradewhere = '';
if(isset($data['grade'])){
$gradewhere = 't_reviewer_to_journal.grade = "'.$data['grade'].'"';
}
$count = 0; $count = 0;
if ($data["keywords"] == "") { if ($data["keywords"] == "") {
if ($data["major_id"] == 0) { if ($data["major_id"] == 0) {
$list = $this->reviewer_to_journal_obj $list = $this->reviewer_to_journal_obj
->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num") ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_reviewer_to_journal.grade,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left") ->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") ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left") ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
->where('t_reviewer_to_journal.journal_id', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->order("t_user.rs_num desc") ->order("t_user.rs_num desc")
->limit($limit_start, $data['pageSize']) ->limit($limit_start, $data['pageSize'])
@@ -1631,16 +1673,18 @@ class Reviewer extends Controller
$count = $this->reviewer_to_journal_obj $count = $this->reviewer_to_journal_obj
->where('t_reviewer_to_journal.journal_id', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->count(); ->count();
} else { } else {
$list = $this->reviewer_to_journal_obj $list = $this->reviewer_to_journal_obj
->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num") ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_reviewer_to_journal.grade,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left") ->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") ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left") ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
->where('t_reviewer_to_journal.journal_id', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where("t_user_reviewer_info.major", $data['major_id']) ->where("t_user_reviewer_info.major", $data['major_id'])
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->order("t_user.rs_num desc") ->order("t_user.rs_num desc")
@@ -1650,6 +1694,7 @@ class Reviewer extends Controller
->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_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', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where("t_user_reviewer_info.major", $data['major_id']) ->where("t_user_reviewer_info.major", $data['major_id'])
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->count(); ->count();
@@ -1657,12 +1702,13 @@ class Reviewer extends Controller
} else { } else {
if ($data["major_id"] == 0) { if ($data["major_id"] == 0) {
$list = $this->reviewer_to_journal_obj $list = $this->reviewer_to_journal_obj
->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num") ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_reviewer_to_journal.grade,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left") ->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") ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left") ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
->where('t_reviewer_to_journal.journal_id', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%") ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->order("t_user.rs_num desc") ->order("t_user.rs_num desc")
@@ -1673,18 +1719,20 @@ class Reviewer extends Controller
->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_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', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%") ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->count(); ->count();
} else { } else {
$list = $this->reviewer_to_journal_obj $list = $this->reviewer_to_journal_obj
->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num") ->field("t_user.user_id,t_user.realname,t_reviewer_major.title cmajor,t_reviewer_to_journal.grade,t_user.account,t_user_reviewer_info.company,t_user_reviewer_info.field,t_user.rs_num,t_user.rd_num")
->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left") ->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") ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left") ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
->where('t_reviewer_to_journal.journal_id', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where("t_user_reviewer_info.major", $data['major_id']) ->where("t_user_reviewer_info.major", $data['major_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%") ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->order("t_user.rs_num desc") ->order("t_user.rs_num desc")
@@ -1696,6 +1744,7 @@ class Reviewer extends Controller
->where('t_reviewer_to_journal.journal_id', $article_info['journal_id']) ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
->where("t_user_reviewer_info.major", $data['major_id']) ->where("t_user_reviewer_info.major", $data['major_id'])
->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids) ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
->where($gradewhere)
->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%") ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
->where('t_reviewer_to_journal.state', 0) ->where('t_reviewer_to_journal.state', 0)
->count(); ->count();

16
application/api/controller/User.php
View File

@@ -704,6 +704,22 @@ class User extends Controller
} }
} }
/**
* 修改用户备注
*/
public function editRemarkForUser(){
$data = $this->request->post();
$rule = new Validate([
'user_id'=>'require|number',
'remark'=>'require'
]);
if(!$rule->check($data)){
return jsonError($rule->getError());
}
$this->user_obj->where('user_id',$data['user_id'])->update(['remark'=>$data['remark']]);
return jsonSuccess([]);
}
/** /**
* 获取验证码图片（密码找回） * 获取验证码图片（密码找回）
*/ */

2
application/common.php
View File

@@ -269,7 +269,7 @@ function my_tg_pushmail($data){
$insert['email'] = $data['email']; $insert['email'] = $data['email'];
$insert['content'] = $data['content']; $insert['content'] = $data['content'];
$insert['is_success'] = $res['status']; $insert['is_success'] = $res['status'];
$insert['attachment'] = $data['attachmentFile']; $insert['attachment'] = $data['attachmentFile']!=''?substr($data['attachmentFile'],strrpos($data['attachmentFile'],'enclosure/')+10):'';
$insert['ctime'] = time(); $insert['ctime'] = time();
$log_obj->insert($insert); $log_obj->insert($insert);
$log_obj->close(); $log_obj->close();