This commit is contained in:
wangjinlei
2024-10-16 14:53:44 +08:00
parent 4a84c9f21c
commit 10bdd968af
4 changed files with 87 additions and 7 deletions

View File

@@ -268,14 +268,16 @@ class Board extends Base {
return jsonError($rule->getError());
}
$journal_info = $this->journal_obj->where('journal_id',$data['journal_id'])->find();
$boards = $this->board_to_journal_obj->field("t_board_to_journal.*,t_user.google_index,t_user.google_time,t_user.wos_index,t_user.wos_time")
$boards = $this->board_to_journal_obj->field("t_board_to_journal.*,t_user.google_index,t_user.google_time,t_user.wos_index,t_user.wos_time,t_user_reviewer_info.country")
->join("t_user","t_user.user_id = t_board_to_journal.user_id","left")
->join("t_user_reviewer_info","t_user_reviewer_info.reviewer_id = t_board_to_journal.user_id","left")
->where("t_board_to_journal.journal_id",$data['journal_id'])
->where('t_board_to_journal.state',0)->select();
$ca_board = $this->getBoardsForJournal($data['journal_id']);
$journal_info["boards"] = $ca_board;
$journal_info['boards_count'] = count($boards);
$board_index = [];
$china_num = 0;
$sum = 0;
foreach ($boards as $val){
if($val['wos_index']>0){
@@ -285,12 +287,18 @@ class Board extends Base {
$board_index[] = $val['google_index'];
$sum += $val['google_index'];
}
if($val['country']=="China"){
$china_num++;
}
}
$journal_info['index_num'] = count($board_index);
$journal_info['median'] = count($board_index)==0?0:zw_array($board_index);
$journal_info['avg'] = count($board_index)==0?0:round($sum/count($board_index),2);
$re['journal'] = $journal_info;
$re['boards'] = $this->getBoardsForJournal($data['journal_id'],true);
$re['boards_count'] = count($boards);
$re['china_count'] = $china_num;
return jsonSuccess($re);
}