diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index 044dcc3..b71a719 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -68,7 +68,7 @@ class Article extends Controller{ //组合cite信息 $no = $stage_info['stage_no']==0?':':'('.$stage_info['stage_no'].'):'; - $cite = $article_info['abbr'].' '.$article_info['title'].' '.$journal_info['jabbr'].' '.$stage_info['stage_year'].';'.$stage_info['stage_vol'].$no.$article_info['npp'].'. doi:'.$article_info['doi']; + $cite = $article_info['abbr'].' '.$article_info['title'].' '.$journal_info['jabbr'].'. '.$stage_info['stage_year'].';'.$stage_info['stage_vol'].$no.$article_info['npp'].'. doi:'.$article_info['doi']; //修改keywords $article_info['keywords'] = str_replace(',','    ', $article_info['keywords']); @@ -91,7 +91,7 @@ class Article extends Controller{ $authors[$key]['ors'] = ''; foreach ($atto as $vv){ if($vv['article_author_id']==$val['article_author_id']){ - $authors[$key]['ors'] = $authors[$key]['ors']==''?''.$cache[$vv['article_organ_id']]:$authors[$key]['ors'].','.$cache[$vv['article_organ_id']]; + $authors[$key]['ors'] = $authors[$key]['ors']==''?''.$cache[$vv['article_organ_id']]:$authors[$key]['ors'].', '.$cache[$vv['article_organ_id']]; } } } @@ -155,7 +155,7 @@ class Article extends Controller{ public function getStageArticles(){ $data = $this->request->post(); $stage_info = $this->journal_stage_obj->where('journal_stage_id',$data['stage_id'])->find(); - $list = $this->article_obj->where('journal_stage_id',$data['stage_id'])->where('state',0)->select(); + $list = $this->article_obj->field('j_article.*,j_journal_stage.*')->join('j_journal_stage','j_article.journal_stage_id = j_journal_stage.journal_stage_id','LEFT')->where('j_article.journal_stage_id',$data['stage_id'])->where('_article.state',0)->select(); // $topic_info = $this->journal_topic_obj->where('journal_topic_id',$data['topic_id'])->find(); // $list = $this->article_to_topic_obj->field('j_article.*,j_journal_stage.*') // ->join(array(['j_article','j_article_to_topic.article_id = j_article.article_id','LEFT'],['j_journal_stage','j_article.journal_stage_id = j_journal_stage.journal_stage_id','LEFT'])) diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php index 6fae582..fc951fe 100644 --- a/application/api/controller/Journal.php +++ b/application/api/controller/Journal.php @@ -183,7 +183,7 @@ class Journal extends Controller { $data = $this->request->post(); $stages = $this->journal_stage_obj->where('journal_id',$data['journal_id'])->where('is_publish',0)->where('state',0)->column('journal_stage_id'); $list = $this->article_obj - ->field('j_article.*,j_journal_stage.stage_year stage_year') + ->field('j_article.*,j_journal_stage.*') ->join('j_journal_stage','j_article.journal_stage_id = j_journal_stage.journal_stage_id','LEFT') ->where('j_article.journal_stage_id','in',$stages) ->where('j_article.state',0) @@ -206,7 +206,7 @@ class Journal extends Controller { $data = $this->request->post(); $stages = $this->journal_stage_obj->where('journal_id',$data['journal_id'])->where('is_publish',1)->where('state',0)->column('journal_stage_id'); $list = $this->article_obj - ->field('j_article.*,j_journal_stage.stage_year stage_year') + ->field('j_article.*,j_journal_stage.*') ->join('j_journal_stage','j_article.journal_stage_id = j_journal_stage.journal_stage_id','LEFT') ->where('j_article.journal_stage_id','in',$stages) ->where('j_article.state',0) @@ -229,7 +229,7 @@ class Journal extends Controller { */ public function getTopArticle(){ $data = $this->request->post(); - $list = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->orderRaw('cited+abs_num+pdf_num desc')->limit(4)->select(); + $list = $this->article_obj->field('j_article.*,j_journal_stage.*')->join('j_journal_stage','j_article.journal_stage_id = j_journal_stage.journal_stage_id','LEFT')->where('j_article.journal_id',$data['journal_id'])->where('j_article.state',0)->orderRaw('j_article.cited+j_article.abs_num+j_article.pdf_num desc')->limit(4)->select(); return jsonSuccess(['articles'=>$list]); } @@ -342,4 +342,23 @@ class Journal extends Controller { return jsonSuccess($re); } + /** + * @title 获取期刊footer文章 + * @description 获取期刊footer文章 + * @author wangjinlei + * @url /api/Journal/getFooterArt + * @method POST + * + * @param name:journal_paper_art_id type:int require:1 desc:期刊footer文章id + * + * @return article:文章内容# + */ + public function getFooterArt(){ + $data = $this->request->post(); + $article = $this->journal_paper_art_obj->where('journal_paper_art_id',$data['journal_paper_art_id'])->find(); + + $re['article'] = $article; + return jsonSuccess($re); + } + } diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php index 69b50d2..a0f098e 100644 --- a/application/master/controller/Journal.php +++ b/application/master/controller/Journal.php @@ -708,7 +708,7 @@ class Journal extends Controller { * @param name:journal_id type:int require:1 desc:期刊id * @param name:title type:string require:1 desc:消息标题 * @param name:content type:string require:1 desc:内容 - * @param name:time type:string require:1 desc:时间 + * @param name:ctime type:string require:1 desc:时间 * */ public function addNotices(){ @@ -716,7 +716,7 @@ class Journal extends Controller { $insert['journal_id'] = $data['journal_id']; $insert['title'] = $data['title']; $insert['content'] = $data['content']; - $insert['ctime'] = $data['time']==''?time():strtotime($data['time']); + $insert['ctime'] = $data['ctime']==''?time():strtotime($data['ctime']); $res = $this->journal_notices_obj->insert($insert); if($res){ return json(['code'=>0,'msg'=>'success']); @@ -751,11 +751,15 @@ class Journal extends Controller { * @param name:journal_notices_id type:int require:1 desc:期刊消息id * @param name:title type:string require:1 desc:消息标题 * @param name:content type:string require:1 desc:内容 + * @param name:ctime type:string require:1 desc:时间 * */ public function changeNotices(){ $data = $this->request->post(); - $this->journal_notices_obj->where('journal_notices_id',$data['journal_notices_id'])->update(['title'=>$data['title'],'content'=>$data['content']]); + $update['title'] = $data['title']; + $update['content'] = $data['content']; + $update['ctime'] = strtotime($data['ctime']); + $this->journal_notices_obj->where('journal_notices_id',$data['journal_notices_id'])->update($update); return json(['code'=>0,'msg'=>'success']); }