From f19744414978ed6c1cd5e1e1c31220a2e898bd43 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 2 Apr 2024 14:53:49 +0800
Subject: [PATCH] 1

---
 application/api/controller/Monitor.php | 4 ++--
 application/api/controller/Web.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/api/controller/Monitor.php b/application/api/controller/Monitor.php
index 5798b0a..ecea85b 100644
--- a/application/api/controller/Monitor.php
+++ b/application/api/controller/Monitor.php
@@ -96,7 +96,7 @@ 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();
+                $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();
 //                $frag[$year."-".$month] = $n."/".$nj;
 //                $n = $this->article_obj->where("ctime",">",$s_time)->where("ctime","<",$e_time)->where("journal_id",$v['journal_id'])->count();
@@ -124,7 +124,7 @@ class Monitor extends Base
             while ($year<date("Y")||($year==date("Y")&&$month<=date("m"))){
                 $s_time = strtotime($year."-".$month."-1");
                 $e_time = strtotime("+1 month", $s_time) - 1;
-                $n = $this->article_obj->where("ctime",">",$s_time)->where("ctime","<",$e_time)->where("accept_sn","like",$v['abbr'])->count();
+                $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();
                 $frag[$year."-".$month] = $n."/".$nj;
                 if($month==12){
diff --git a/application/api/controller/Web.php b/application/api/controller/Web.php
index 45cbcd1..23d67e4 100644
--- a/application/api/controller/Web.php
+++ b/application/api/controller/Web.php
@@ -182,7 +182,7 @@ class Web extends Base
             }else{
                 $reviewers[$k]['reviewer_name'] = "anonymous";
             }
-            if(($article_info['journal_id']==1&&$p_info['journal_stage_id']>=453)||$article_info['journal_id']==23){
+            if(($article_info['journal_id']==1&&$p_info['journal_stage_id']>=453)||($article_info['journal_id']==6&&$p_info['journal_stage_id']>=515)||$article_info['journal_id']==23){
                 //添加初审问卷
                 $reviewers[$k]['question'] = $this->article_reviewer_question_obj->where('art_rev_id',$v['art_rev_id'])->find();
                 //添加复审问卷