diff --git a/application/api/controller/Monitor.php b/application/api/controller/Monitor.php index f0f752f..6f7c1f3 100644 --- a/application/api/controller/Monitor.php +++ b/application/api/controller/Monitor.php @@ -137,10 +137,15 @@ class Monitor extends Base $dn = $this->getDN($v['journal_id'],date("Y")); $journals[$k]['ZS'] = $dn['zs']; $journals[$k]['CS'] = $dn['cs']; - //当年投稿情况 + //去年投稿情况 $nare = $this->getNZT($v['journal_id'],date("Y")-1); $journals[$k]['NZ'] = $nare['z']; $journals[$k]['NZT'] = $nare['zt']; + //今年投稿情况 + $dnare = $this->getNZT($v['journal_id'],date("Y")); + $journals[$k]['DNZ'] = $dnare['z']; + $journals[$k]['DNZT'] = $dnare['zt']; + } $re['journals'] = $journals; @@ -264,7 +269,12 @@ class Monitor extends Base $start = strtotime(date($y."-01-01 00:00:00")); $end = strtotime(date($y."-12-31 23:59:59")); $journal_info = $this->journal_obj->where('journal_id',$journal_id)->find(); - $articles = $this->article_obj->where('accept_sn',"like",$journal_info['abbr']."%")->where('ctime',">",$start)->where("ctime","<",$end)->select(); + if($y==2023&&$journal_info['abbr']=="PD"){ + $qabbr = "PR"; + }else{ + $qabbr = $journal_info['abbr']; + } + $articles = $this->article_obj->where('accept_sn',"like",$qabbr."%")->where('ctime',">",$start)->where("ctime","<",$end)->select(); $zt_articles = $this->article_obj->where('accept_sn',"not like",$journal_info['abbr']."%")->where('ctime',">",$start)->where('journal_id',$journal_id)->where("ctime","<",$end)->select(); $re['zt'] =count($zt_articles); $re['z'] = count($articles);