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

Browse Source
This commit is contained in:
Administrator
2022-01-19 17:52:12 +08:00
parent cc4f5b6a56
commit 9bec064198
3 changed files with 92 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,8 +215,8 @@ class Article extends Controller {
->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']))
->where('j_article_to_topic.topic_id', $data['topic_id'])
->where('j_article_to_topic.state', 0)
->where('j_journal_stage.stage_year','>',intval(date('Y'))-3)
->orderRaw('(abs_num+pdf_num) desc')
// ->where('j_journal_stage.stage_year','>',intval(date('Y'))-3)
->orderRaw('j_journal_stage.stage_year desc ,(abs_num+pdf_num) desc')
// ->order('j_article.journal_stage_id desc , j_article.article_id desc')
->limit($limit_start,$data['pageSize'])
->select();
@@ -224,7 +224,7 @@ class Article extends Controller {
->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']))
->where('j_article_to_topic.topic_id', $data['topic_id'])
->where('j_article_to_topic.state', 0)
->where('j_journal_stage.stage_year','>',intval(date('Y'))-3)
// ->where('j_journal_stage.stage_year','>',intval(date('Y'))-3)
->count();
//获取作者
foreach ($list as $k => $v) {
@@ -283,7 +283,8 @@ class Article extends Controller {
$data = $this->request->post();
$stage_info = $this->journal_stage_obj->where('journal_stage_id', $data['stage_id'])->find();
$journal_info = $this->journal_obj->where('journal_id',$stage_info['journal_id'])->find();
$list = $this->article_obj->field('j_article.*,j_journal_stage.*')
$list = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title')
->join("j_journal",'j_journal.journal_id = j_article.journal_id','left')
->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('j_article.state', 0)
@@ -310,8 +311,9 @@ class Article extends Controller {
}
$list[$k]['title'] = $cache_title;
}
$l = choiseJtitle($list);
$re['stageInfo'] = $stage_info;
$re['articleList'] = $list;
$re['articleList'] = $l;
return jsonSuccess($re);
}