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

20201112

Browse Source
This commit is contained in:
wangjinlei
2020-12-29 17:30:57 +08:00
parent 7ffed99801
commit 9c3e2cb210
3 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/master/controller/Journal.php
View File

@@ -472,6 +472,7 @@ class Journal extends Controller {
*
* @param name:journal_id type:int require:1 desc:期刊id
* @param name:topic_id type:int require:1 desc:话题id
* @param name:title type:string require:1 desc:标题
* @param name:pageIndex type:int require:1 desc:当前页码数
* @param name:pageSize type:int require:1 desc:单页数据条数
*
@@ -482,8 +483,8 @@ class Journal extends Controller {
//排除stage
$ids = $this->article_to_topic_obj->where('topic_id',$data['topic_id'])->where('state',0)->column('article_id');
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$list = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->limit($limit_start,$data['pageSize'])->select();
$count = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->count();
$list = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->where('title','like','%'.$data['title'].'%')->limit($limit_start,$data['pageSize'])->select();
$count = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->where('title','like','%'.$data['title'].'%')->count();
return json(['code'=>0,'msg'=>'success','data'=>['count'=>$count,'dataList'=>$list]]);
}
@@ -1151,7 +1152,7 @@ class Journal extends Controller {
$data = $this->request->post();
$journal_line_info = $this->journal_line_obj->where('journal_line_id',$data['journal_line_id'])->find();
$journal_info = $this->journal_obj->where('journal_id',$journal_line_info['journal_id'])->find();
$list = $this->article_to_line_obj->field('j_article.*')
$list = $this->article_to_line_obj->field('j_article_to_line.*,j_article.*')
->join('j_article','j_article.article_id = j_article_to_line.article_id','LEFT')
->where('j_article_to_line.journal_line_id',$data['journal_line_id'])
->where('j_article_to_line.state',0)
@@ -1172,6 +1173,7 @@ class Journal extends Controller {
*
* @param name:journal_id type:int require:1 desc:期刊id
* @param name:journal_line_id type:int require:1 desc:时间线id
* @param name:title type:string require:1 desc:标题
* @param name:pageIndex type:int require:1 desc:当前页码数
* @param name:pageSize type:int require:1 desc:单页数据条数
*
@@ -1183,8 +1185,8 @@ class Journal extends Controller {
//排除line
$ids = $this->article_to_line_obj->where('journal_line_id',$data['journal_line_id'])->where('state',0)->column('article_id');
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$list = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->limit($limit_start,$data['pageSize'])->select();
$count = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->count();
$list = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->where('title','like','%'.$data['title'].'%')->limit($limit_start,$data['pageSize'])->select();
$count = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->where('title','like','%'.$data['title'].'%')->count();
$re['count'] = $count;
$re['dataList'] = $list;