1

application/api/controller/Article.php

@@ -34,6 +34,7 @@ class Article extends Controller {
     protected $reviewer_from_author_obj = '';
     protected $article_dialog_obj = '';
     protected $article_proposal_obj = '';
+    protected $article_response_to_reviewer_obj = '';
     protected $user_black_obj = '';
     protected $user_reviewer_recommend_obj = '';
 
@@ -60,6 +61,7 @@ class Article extends Controller {
         $this->reviewer_from_author_obj = Db::name("reviewer_from_author");
         $this->article_dialog_obj = Db::name('article_dialog');
         $this->article_proposal_obj = Db::name('article_proposal');
+        $this->article_response_to_reviewer_obj = Db::name('article_response_to_reviewer');
         $this->user_black_obj = Db::name('user_black');
         $this->user_reviewer_recommend_obj = Db::name('user_reviewer_recommend');
     }
@@ -506,6 +508,23 @@ class Article extends Controller {
         }
         
     }
+
+    /**
+     * 获取全部作者反馈审稿人文件列表
+     */
+    public function getArticleResponseFiles(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            'article_id'=>'require'
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $list = $this->article_response_to_reviewer_obj->where('article_id',$data['article_id'])->where('artr_state',0)->select();
+        $re['files'] = $list;
+        return jsonSuccess($re);
+    }
+    
     
     /**
      * @title 修回文章
@@ -518,6 +537,7 @@ class Article extends Controller {
      * @param name:articleId type:int require:1 desc:文章id
      * @param name:picturesAndTables type:string require:1 desc:Figures
      * @param name:manuscirpt type:string require:1 desc:文章文件
+     * @param name:responseFile type:string require:0 desc:作者反馈审稿人文件
      * 
      */
     public function RepairBack(){
@@ -567,6 +587,16 @@ class Article extends Controller {
         $res2 = self::save_article_file($data['articleId'], $user_res['user_id'], $user_res['account'], $data['picturesAndTables'], 'picturesAndTables');
         $res3 = self::save_article_file($data['articleId'], $user_res['user_id'], $user_res['account'], $data['manuscirpt'], 'manuscirpt');
         
+        //作者反馈审稿人信息文件
+        $res_response = true;
+        if(isset($data['responseFile'])&&$data['responseFile']!=''){
+            $insert_response['article_id'] = $data['articleId'];
+            $insert_response['file_url'] = $data['responseFile'];
+            $insert_response['artr_ctime'] = time();
+            $res_response = $this->article_response_to_reviewer_obj->insert($insert_response);
+        }
+        
+        
         //增加用户操作log
         $log_data['user_id'] = $article_info['user_id'];
         $log_data['type'] = 1;
@@ -577,7 +607,7 @@ class Article extends Controller {
         //增加usermsg
         $umsg_res=add_usermsg($journal_info['editor_id'], 'The manuscript has new process:  ' . $article_info['title'], '/articleDetailEditor?id=' . $article_info['article_id']);
     
-        if($msg_res&&$res2&&$res3&&$log_res&&$umsg_res){
+        if($msg_res&&$res2&&$res3&&$log_res&&$umsg_res&&$res_response){
             Db::commit();
             return json(['code' => 0]);
         }else{
@@ -754,6 +784,8 @@ class Article extends Controller {
      * @param name:state type:int require:1 desc:状态代码
      * @param name:editormsg type:String require:1 desc:携带的消息（以后会废除）
      * @param name:trsjournal type:int require:0 desc:转投期刊id(拒稿时候是必传，不推荐转投的为0)
+     * @param name:proposal_content type:string require:0 desc:退修编辑意见文件
+     * 
      * 
      */
     public function editArticleEditor() {
@@ -879,6 +911,13 @@ class Article extends Controller {
             //更新文章状态
             if($data['state']==4){
                 $update_data['ttime'] = time();
+                //退休状态，添加退修时编辑的意见
+                if(isset($data['proposal_content'])&&$data['proposal_content']!=''){//存在这个修回的文件
+                    $insert_proposal['article_id'] = $data['articleId'];
+                    $insert_proposal['proposal_content'] = trim($data['proposal_content']);
+                    $insert_proposal['ap_ctime'] = time();
+                    $this->article_proposal_obj->insert($insert_proposal);
+                }
             }
             if($data['state']==3){
                 $update_data['rstime'] = time();
@@ -1795,6 +1834,21 @@ class Article extends Controller {
         }
     }
 
+    /**
+     * 上传作者反馈审稿人文件
+     */
+    public function up_response_file(){
+        $file = request()->file('articleResponse');
+        if ($file) {
+            $info = $file->move(ROOT_PATH . 'public' . DS . 'articleResponse');
+            if ($info) {
+                return json(['code' => 0, 'upurl' => str_replace("\\", "/", $info->getSaveName())]);
+            } else {
+                return json(['code' => 1, 'msg' => $file->getError()]);
+            }
+        }
+    }
+
     /**
      * 获取文章审稿实例列表
      */
@@ -1851,6 +1905,8 @@ class Article extends Controller {
 //        $revids = $this->reviewer_to_journal_obj->where('journal_id', $article_info['journal_id'])->where('state',0)->column('reviewer_id');
 
         $noids = $this->article_reviewer_obj->where('article_id', $data['articleId'])->column('reviewer_id');
+
+        $noids[] = $article_info['user_id'];
         
         $res = $this->reviewer_to_journal_obj
                 ->field('t_user.user_id,t_user.account')