diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index c1cbfa8..52ecc16 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -2006,6 +2006,10 @@ class Article extends Base } $user_info = $this->user_obj->where('user_id', $data['user_id'])->find(); $journal_info = $this->journal_obj->where('journal_id', $data['journal'])->find(); + + if($journal_info['state']==1){ + return jsonError("Submission failed"); + } $article_id = $data['article_id']; //添加文章基础信息 if ($data['article_id'] == 0) { @@ -2832,6 +2836,7 @@ class Article extends Base $uidres = $this->user_obj->where(['account' => $username])->column('user_id'); $where['editor_id'] = $uidres[0]; } + $where['state'] = 0; $list = $this->journal_obj->where($where)->select(); return json($list); } diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php index e1253f6..5107ac9 100644 --- a/application/api/controller/Production.php +++ b/application/api/controller/Production.php @@ -743,6 +743,9 @@ class Production extends Base if ($p_info['bibtex'] != '') { $pra['bibtex'] = $p_info['bibtex']; } + if ($p_info['file_original'] != ''){ + $pra['file_original'] = $p_info['file_original']; + } $pra['file_pdf'] = $p_info['file_pdf']; $pra['keywords'] = $p_info['keywords']; $pra['npp'] = $p_info['npp']; @@ -1622,6 +1625,8 @@ class Production extends Base $updata['bibtex'] = $data['fileURL']; } elseif ($data['filetype'] == 'CDF') { $updata['file_cdf'] = $data['fileURL']; + }elseif ($data['filetype'] == 'Original') { + $updata['file_original'] = $data['fileURL']; } $this->production_article_obj->where('p_article_id', $data['p_article_id'])->update($updata); return jsonSuccess([]); @@ -1759,8 +1764,8 @@ class Production extends Base /** * @title 文章文件上传 * - * @param name:name type:string require:1 desc:文件域名称(articleSUB/articleSUB2/bibTex/endNote/articleCDF) - * @param name:type type:string require:1 desc:pathinfo(articleSUB/articleSUB2/bibTex/endNote/articleCDF) + * @param name:name type:string require:1 desc:文件域名称(articleSUB/articleSUB2/bibTex/endNote/articleCDF/articleOriginal) + * @param name:type type:string require:1 desc:pathinfo(articleSUB/articleSUB2/bibTex/endNote/articleCDF/articleOriginal) * * @return upurl:图片地址 */ diff --git a/application/api/controller/Web.php b/application/api/controller/Web.php index b0846f3..45ed06f 100644 --- a/application/api/controller/Web.php +++ b/application/api/controller/Web.php @@ -4,6 +4,7 @@ namespace app\api\controller; use app\api\controller\Base; use think\Db; use think\Queue; +use think\Url; use think\Validate; class Web extends Base @@ -114,11 +115,21 @@ 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){ + //添加初审问卷 + $reviewers[$k]['question'] = $this->article_reviewer_question_obj->where('art_rev_id',$v['art_rev_id'])->find(); + //添加复审问卷 + $reviewers[$k]['re_question']=$this->article_reviewer_repeat_obj->where('art_rev_id',$v['art_rev_id'])->select(); + }else { + $reviewers[$k]['question'] = []; + $reviewers[$k]['re_question'] = []; + } } $begin['type'] = 0; $begin['time'] = $article_info['ctime']; $frag[] = $begin; $reviewer_has = false; + $reciv = false; foreach ($msgs as $v){ if($v['state_to']==2&&!$reviewer_has){ $reviewer_has = true; @@ -129,6 +140,16 @@ class Web extends Base ]; continue; } + if($v['state_to']==4&&!$reciv&&$reviewer_has&&(($article_info['journal_id']==1&&$p_info['journal_stage_id']>=453)||$article_info['journal_id']==23)){ + $r_files = $this->article_response_to_reviewer_obj->where('article_id',$article_info['article_id'])->select(); + $reciv=true; + $frag[] = [ + "type"=>$v['state_to'], + "response" => $r_files, + "time"=>$v['ctime'] + ]; + continue; + } $frag[] = [ "type"=>$v['state_to'], "time"=>$v['ctime'] diff --git a/application/common.php b/application/common.php index ce2fd91..367b2a2 100644 --- a/application/common.php +++ b/application/common.php @@ -301,7 +301,7 @@ function GptChar($message,$ckey) if ($fp) { while (!feof($fp)) { $chunk = fgets($fp); - // echo $chunk; + echo $chunk; $cache = object_to_array(json_decode(substr($chunk,6))); if(isset($cache['choices'][0]['delta']['content'])){ $cc = Cache::get($ckey)?Cache::get($ckey):'';