小bug调整

application/master/controller/Article.php

@@ -1476,6 +1476,46 @@ class Article extends Controller
         return json(['code' => 0, 'msg' => 'success', 'data' => ['nowtopic' => $now_list, 'topics' => $frag]]);
     }
 
+
+    public function getTopicByIssn(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "issn"=>"require"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $journal = $this->journal_obj->where("issn",$data['issn'])->find();
+        $topic_res = $this->journal_topic_obj->where('journal_id', $journal['journal_id'])->where('state', 0)->select();
+        $frag = [];
+        foreach ($topic_res as $v) {
+            if ($v['is_final'] == 1) {
+                $frag[] = $v;
+            }
+        }
+        foreach ($frag as $k => $val) {
+            $frag[$k]['tname'] = $this->getTname($val, $topic_res);
+        }
+        $re['list']=$frag;
+        return jsonSuccess($re);
+    }
+
+    public function getArticlesForSubmission(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "ids"=>"require"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $res = $this->article_obj
+            ->field("j_article.*,j_journal.title journal_title")
+            ->join("j_journal","j_journal.journal_id = j_article.journal_id","left")
+            ->whereIn("j_article.article_id",json_decode($data['ids']))->select();
+        $re['list'] = $res;
+        return jsonSuccess($re);
+    }
+
     private function getTname($now, $arr)
     {
         if ($now['parent_id'] == 0) {

application/master/controller/Datebase.php

@@ -813,9 +813,9 @@ class Datebase extends Controller
             //            sendEmail_data($v, "Data submitted-TMR Publishing Group", "Data submitted-TMR Publishing Group", $tt, $journal_info['email'], $journal_info['epassword'],$zipfile);
         }
         //发送sftp
-        $this->bf_db_push($data["journal_stage_id"]);
+//        $this->bf_db_push($data["journal_stage_id"]);
         // 发送ftp
-        $this->createFtpFileInfo($data["journal_stage_id"]);//cnki数据库
+//        $this->createFtpFileInfo($data["journal_stage_id"]);//cnki数据库
 
         if($journal_info['journal_id']==1||$journal_info['journal_id']==11){
             $this->scopusPushXML($data["journal_stage_id"]);//scopus数据库
@@ -1000,13 +1000,6 @@ class Datebase extends Controller
 
 
 
-    public function creTest(){
-        $this->createEmailFile(654);
-    }
-
-
-
-
     private function createEmailFile($journal_stage_id)
     {
         $url = $this->ts_base_url."api/dataApi/createTemplate";