diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index 4fc4b24..cdd06df 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -73,6 +73,7 @@ class Article extends Controller { //标题斜体 $caches = $this->article_ltai_obj->where('article_id',$article_info['article_id'])->where('state',0)->column('content'); $cache_title = $article_info['title']; + $article_info['old_title'] = $article_info['title']; foreach ($caches as $val){ $cache_title = str_replace($val, ''.$val.'', $cache_title); } @@ -86,6 +87,14 @@ class Article extends Controller { $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']; } + if(stripos($article_info['npp'], '-')){ + $cc = explode('-', $article_info['npp']); + $article_info['first_page'] = $cc[0]; + $article_info['last_page'] = $cc[1]; + } + + $article_info['publication'] = date('Y/m/d', strtotime($article_info['pub_date'])); + //修改keywords $article_info['keywords'] = str_replace(',', '    ', $article_info['keywords']); diff --git a/application/api/controller/Main.php b/application/api/controller/Main.php index 16407a6..e81319a 100644 --- a/application/api/controller/Main.php +++ b/application/api/controller/Main.php @@ -43,6 +43,10 @@ class Main extends Controller { $this->sys_not_obj = Db::name('system_notices'); $this->article_ltai_obj = Db::name('article_ltai'); } + + public function ttest(){ + echo strtotime('2021-02-26'); + } /** * @title 获取scients diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php index aee7874..2214c41 100644 --- a/application/master/controller/Article.php +++ b/application/master/controller/Article.php @@ -898,10 +898,16 @@ class Article extends Controller { $data = $this->request->post(); $where = []; if($data['state']>=0){ - $where['state'] = $data['state']; + $where['j_article_cite.state'] = $data['state']; } $limit_start = ($data['pageIndex'] - 1) * $data['pageSize']; - $list = $this->article_cite_obj->where($where)->order('state asc,article_cite_id asc')->limit($limit_start,$data['pageSize'])->select(); + $list = $this->article_cite_obj + ->field('j_article_cite.*,j_journal.title journal_title') + ->join('j_journal','j_journal.journal_id = j_article_cite.journal_id','left') + ->where($where) + ->order('j_article_cite.state asc,j_article_cite.article_cite_id asc') + ->limit($limit_start,$data['pageSize']) + ->select(); $count = $this->article_cite_obj->where($where)->count(); $re['count'] = $count;