diff --git a/application/api/controller/Monitor.php b/application/api/controller/Monitor.php index 723289f..c69baa6 100644 --- a/application/api/controller/Monitor.php +++ b/application/api/controller/Monitor.php @@ -96,8 +96,15 @@ class Monitor extends Base while ($year<=date("Y")){ $s_time = strtotime($year."-1-1"); $e_time = strtotime($year."-12-31"); - $n = $this->article_obj->where("ctime",">",$s_time)->where("ctime","<",$e_time)->where("accept_sn","like",$v['abbr']."%")->count(); - $nj = $this->article_obj->where("ctime",">",$s_time)->where("ctime","<",$e_time)->where("accept_sn","like",$v['abbr']."%")->where("journal_id","<>",$v['journal_id'])->count(); + $abbr = $v['abbr']; + if($abbr=="NTA"&&$year<2024){ + $abbr = "MHM"; + } + if($abbr=="PD"&&$year<2024){ + $abbr = "PR"; + } + $n = $this->article_obj->where("ctime",">",$s_time)->where("ctime","<",$e_time)->where("accept_sn","like",$abbr."%")->count(); + $nj = $this->article_obj->where("ctime",">",$s_time)->where("ctime","<",$e_time)->where("accept_sn","like",$abbr."%")->where("journal_id","<>",$v['journal_id'])->count(); // $frag[$year."-".$month] = $n."/".$nj; // $n = $this->article_obj->where("ctime",">",$s_time)->where("ctime","<",$e_time)->where("journal_id",$v['journal_id'])->count(); $frag[$year] = $n."/".$nj; diff --git a/application/api/controller/Super.php b/application/api/controller/Super.php index 7b162ad..6fa9811 100644 --- a/application/api/controller/Super.php +++ b/application/api/controller/Super.php @@ -76,7 +76,7 @@ class Super extends Controller { $end_time = strtotime(date("Y")."-12-31 23:59:59"); $q_start_time = strtotime((date("Y")-1)."-01-01"); $q_end_time = strtotime((date("Y")-1)."-12-31 23:59:59"); - $journal_list = $this->journal_obj->field("journal_id,title,issn,abbr")->where("editor_id",$data['editor_id'])->select(); + $journal_list = $this->journal_obj->field("journal_id,title,issn,abbr")->where("editor_id",$data['editor_id'])->where("state",0)->select(); $gjh_url = "http://journalapi.tmrjournals.com/public/index.php/super/Publish/getGJHByIssn"; foreach ($journal_list as $k => $v){