1

2022-08-05 11:18:52 +08:00
parent a23e9640b3
commit c88aa8bb2f
5 changed files with 64 additions and 14 deletions
--- a/application/api/controller/Article.php
+++ b/application/api/controller/Article.php
@@ -5,6 +5,7 @@ namespace app\api\controller;
 use think\Controller;
 use think\Db;
 use think\Queue;
+use think\Validate;

 /**
 * @title 文章接口
@@ -1165,6 +1166,39 @@ class Article extends Controller {

        return json(['code' => 0]);
    }
+
+
+    /**
+     * 获取文章文件
+     */
+    public function getFilesForArticle(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            'article_id'=>'require',
+            'type'=>'require'
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $type = '';
+        switch($data['type']){
+            case "m":
+                $type = 'manuscirpt';
+                break;
+            case "c":
+                $type = 'coverLetter';
+                break;
+            case "p";
+                $type = 'picturesAndTables';
+                break;
+            default:
+                $type = 'manuscirpt';
+                break;
+        }
+        $files = $this->article_file_obj->where('article_id',$data['article_id'])->where('state',0)->where('type_name',$type)->order('ctime')->select();
+        $re['files'] = $files;
+        return jsonSuccess($re);
+    }
    
    

--- a/application/api/controller/Reviewer.php
+++ b/application/api/controller/Reviewer.php
@@ -589,6 +589,24 @@ class Reviewer extends Controller
        return jsonSuccess($re);
    }

+
+    public function getRevEmailByTopic(){
+        $data = $this->request->post();
+        $topic= $this->reviewer_major_obj->where('title',trim($data['topic']))->where('state',0)->find();
+        if($topic==null){
+            return jsonError("topic not find");
+        }
+        $list = $this
+        ->user_reviewer_info_obj
+        ->field('t_user.email')
+        ->join('t_user','t_user.user_id = t_user_reviewer_info.reviewer_id','left')
+        ->where('t_user_reviewer_info.major',$topic['major_id'])
+        ->where('t_user_reviewer_info.state',0)->select();
+
+        $re['reviewers'] = $list;
+        return jsonSuccess($re);
+    }
+
    /**
     * @title 提交问卷(审稿人)
     * @description 提交问卷(审稿人)
@@ -937,6 +955,7 @@ class Reviewer extends Controller
        $reviewer_info = $this->user_obj->where('user_id', $art_rev_info['reviewer_id'])->find();
        $article_info = $this->article_obj->where('article_id', $art_rev_info['article_id'])->find();
        $journal_info = $this->journal_obj->where('journal_id', $article_info['journal_id'])->find();
+        $rev_ques_info = $this->article_reviewer_question_obj->where('art_rev_id',$art_rev_id)->find();
        //        $url = 'http://journalapi.tmrjournals.com/public/index.php/master/Journal/getJournalIcon';
        //        $res = object_to_array(json_decode(myPost($url, ['issn'=>$journal_info['issn']])));
        //        $img = 'http://journalapi.tmrjournals.com/public/journalicon/'.$res['data']['icon'];
@@ -946,7 +965,7 @@ class Reviewer extends Controller
        $image = \think\Image::open($template);
        $image->text($journal_info['title'], $ziti, 70, '#000000', [1450, 950])
            ->text($reviewer_info['realname'] == '' ? $reviewer_info['account'] : $reviewer_info['realname'], $ziti, 60, '#000000', [1900, 1700])
-            ->text('awarded ' . date('d, F, Y', $article_info['rtime'] == 0 ? $article_info['ctime'] : $article_info['rtime']) . ' to', $ziti, 60, '#000000', [1600, 1500])
+            ->text('awarded ' . date('d, F, Y', $rev_ques_info['ctime'] == 0 ? $article_info['ctime'] : $rev_ques_info['ctime']) . ' to', $ziti, 60, '#000000', [1600, 1500])
            ->text('In recognition of the review made for the journal', $ziti, 80, '#000000', [900, 1900])
            ->text($article_info['title'], $ziti, 30, '#000000', [230, 2100])
            ->text('The Editors of', $ziti, 65, '#000000', [230, 2345])
@@ -1642,7 +1661,7 @@ class Reviewer extends Controller
                    ->join("t_reviewer_major", "t_reviewer_major.major_id = t_user_reviewer_info.cmajor", "left")
                    ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
                    ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
-                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
                    ->where('t_reviewer_to_journal.state', 0)
                    ->order("t_user.rs_num desc")
                    ->limit($limit_start, $data['pageSize'])
@@ -1652,7 +1671,7 @@ class Reviewer extends Controller
                    ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
                    ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
                    ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
-                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
                    ->where('t_reviewer_to_journal.state', 0)
                    ->count();
            } else {
@@ -1664,7 +1683,7 @@ class Reviewer extends Controller
                    ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
                    ->where("t_user_reviewer_info.major", $data['major_id'])
                    ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
-                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
                    ->where('t_reviewer_to_journal.state', 0)
                    ->order("t_user.rs_num desc")
                    ->limit($limit_start, $data['pageSize'])
@@ -1675,7 +1694,7 @@ class Reviewer extends Controller
                    ->where('t_reviewer_to_journal.journal_id', $article_info['journal_id'])
                    ->where("t_user_reviewer_info.major", $data['major_id'])
                    ->where('t_reviewer_to_journal.reviewer_id', 'not in', $noids)
-                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account", "like", "%" . $data["keywords"] . "%")
+                    ->where("t_user_reviewer_info.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname", "like", "%" . $data["keywords"] . "%")
                    ->where('t_reviewer_to_journal.state', 0)
                    ->count();
            }
--- a/application/api/controller/Typeset.php
+++ b/application/api/controller/Typeset.php
@@ -383,14 +383,11 @@ class Typeset extends Controller

        $typesetInfo['refers'] = json_encode($refers);

-        $url = "http://localhost:8081/typeset/webGetDocx";
+        // $url = "http://localhost:8081/typeset/webGetDocx";
        // $url = "http://192.168.110.100:8080/typeset/webGetDocx";
-        // $url = "http://ts.tmrjournals.com/api/typeset/webGetDocx";
+        $url = "http://ts.tmrjournals.com/api/typeset/webGetDocx";
        // var_dump($typesetInfo);die;
        $res = object_to_array(json_decode(myPost1($url, $typesetInfo)));
-
-
-        var_dump($res);die;
        if(!isset($res['data']['file'])||$res['data']['file']==''){
            return jsonError('create error');
        }
@@ -404,7 +401,7 @@ class Typeset extends Controller
        return jsonSuccess([]);
    }

-    
+
    /**
     * 编辑排版实例
     */
--- a/application/api/job/ts.php
+++ b/application/api/job/ts.php
@@ -3,15 +3,14 @@
 namespace app\api\job;

 use think\queue\Job;
-use think\Db;

 class ts {

    //put your code here

-    public function fire(Job $job, $data) {
-        $job->delete();
+    public function fire(Job $job, $data) { 
        my_doiToFrag($data);
+        $job->delete();
    }


--- a/application/common.php
+++ b/application/common.php
@@ -195,6 +195,7 @@ function translateType($type) {
            break;
        default:
            $frag = 'OTHERS';
+            break;
    }
    return $frag;
 }