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
2021-09-06 14:10:37 +08:00
parent 375b62ab9d
commit c80c9f8da7
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/api/controller/Main.php
View File

@@ -136,8 +136,8 @@ class Main extends Controller {
$list_zh = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',17)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select();
$list_life = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',14)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select();
$list_fyw = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',20)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select();
$list_ywlh = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',6)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select();
$list_zy = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',18)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select();
$list_ywlh = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',8)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select();
$list_zy = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',16)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select();
$list = $list_tmr;
$list[] = $list_zh[0];
$list[] = $list_life[0];
@@ -393,7 +393,7 @@ class Main extends Controller {
$dir = $root_url."public/".$data['dir'].'/'.date('Ymd');
// $dir = $root_url."public/".$data['dir'].'/20210515';
if(!is_dir($dir)){
mkdir ($dir,0777,true);
mkdir ($dir,0777,true);
}
$list = json_decode($data['files']);
@@ -589,6 +589,7 @@ class Main extends Controller {
public function bindBoard(){
$data = $this->request->post();
$up['tuser_id'] = $data['user_id'];
$up['email'] = $data['email'];
$this->board_obj->where('board_id',$data['board_id'])->update($up);
return json('success');
}

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

@@ -530,6 +530,8 @@ class Journal extends Controller {
return json(['code'=>1,'msg'=>'删除的话题不能有子节点!']);
}
$res = $this->journal_topic_obj->where('journal_topic_id',$data['journal_topic_id'])->update(['state'=>1]);
//删除此话题下的话题文章对应关系
$this->article_to_topic_obj->where('topic_id',$data['journal_topic_id'])->update(['state'=>1]);
if($res){
return json(['code'=>0,'msg'=>'success']);
}else{
@@ -1355,6 +1357,7 @@ class Journal extends Controller {
* @param name:journal_paper_id type:int require:1 desc:期刊paperid
* @param name:journal_id type:int require:1 desc:期刊id
* @param name:title type:string require:1 desc:标题
* @param name:sort type:int require:1 desc:权重
* @param name:content type:string require:1 desc:内容
*
*/
@@ -1364,6 +1367,7 @@ class Journal extends Controller {
$insert['journal_id'] = $data['journal_id'];
$insert['title'] = $data['title'];
$insert['content'] = $data['content'];
$insert['sort'] = $data['sort'];
$insert['ctime'] = time();
$this->journal_paper_art_obj->insert($insert);
return jsonSuccess([]);
@@ -1395,6 +1399,7 @@ class Journal extends Controller {
* @param name:journal_paper_art_id type:int require:1 desc:期刊paper文章id
* @param name:title type:string require:1 desc:标题
* @param name:content type:string require:1 desc:内容
* @param name:sort type:int require:1 desc:权重
*
*/
public function editJournalPaperArt(){
@@ -1694,7 +1699,7 @@ class Journal extends Controller {
public function getJournalPaperArt(){
$data = $this->request->post();
$paper_info = $this->journal_paper_obj->where('journal_paper_id',$data['journal_paper_id'])->find();
$list = $this->journal_paper_art_obj->where('journal_paper_id',$data['journal_paper_id'])->where('state',0)->select();
$list = $this->journal_paper_art_obj->where('journal_paper_id',$data['journal_paper_id'])->where('state',0)->order('sort')->select();
$re['paperinfo'] = $paper_info;
$re['articleLists'] = $list;

29
application/super/controller/Publish.php
View File

@@ -240,6 +240,7 @@ class Publish extends Controller{
$journals[$k]['FWL'] = $this->getFWL($v['journal_id'],$start,$end);
$journals[$k]['LX'] = $this->getLX($v['journal_id'],$start,$end);
$journals[$k]['GJH'] = $this->getGJH($v['journal_id'],$start,$end);
$journals[$k]['GNW'] = $this->getGNW($v['journal_id'],$start,$end);
$journals[$k]['CK'] = $this->getCK($v['journal_id']);
$journals[$k]['BW'] = $this->getBW($v['journal_id']);
$journals[$k]['DY'] = $this->subscribe_journal_obj->where('journal_id',$v['journal_id'])->where('state',0)->count();
@@ -401,6 +402,34 @@ class Publish extends Controller{
return $frag;
}
private function getGNW($journal_id,$start,$end){
$stages = $this->journal_stage_obj
->where('journal_id',$journal_id)
->where('is_publish',1)
->where('state',0)
->column('journal_stage_id');
$arts = $this->article_obj->where('journal_id',$journal_id)->where('journal_stage_id','in',$stages)->where('ctime','>',$start)->where('ctime','<=',$end)->where('state',0)->select();
$frag = [];
foreach ($arts as $k => $v){
$ca_aus = $this->article_author_obj->where('article_id',$v['article_id'])->where('state',0)->where('author_country','<>','China')->find();
if($ca_aus==null){
if(isset($frag['n'])){
$frag['n'] += 1;
}else{
$frag['n'] = 1;
}
} else{
if(isset($frag['w'])){
$frag['w'] += 1;
}else{
$frag['w'] = 1;
}
}
}
return $frag;
}
private function getGJH($journal_id,$start,$end){
$stages = $this->journal_stage_obj
->where('journal_id',$journal_id)