From 6325c4adb7f62f640b8ab0dcda129e97d3f0fcaa Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 16 Nov 2020 11:47:31 +0800
Subject: [PATCH] 20201112

---
 application/master/controller/Article.php | 14 ++++++++--
 application/master/controller/Journal.php | 32 +++--------------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php
index f8eeded..7211f24 100644
--- a/application/master/controller/Article.php
+++ b/application/master/controller/Article.php
@@ -23,8 +23,18 @@ class Article extends Controller {
         $this->journal_topic_obj = Db::name('journal_topic');
     }
     
-    
-    
+    /**
+     * @title 添加文章
+     * @description 添加文章
+     * @author wangjinlei
+     * @url /master/Journal/addArticle
+     * @method POST
+     * 
+     * @param name:journal_topic_id type:int require:1 desc:主键
+     */
+    public function addArticle(){
+        
+    }
     
     
 }
diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index 140b9a7..8bdf312 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -32,10 +32,8 @@ class Journal extends Controller  {
      * @url /master/Journal/getJournalList
      * @method POST
      * 
-     * 
      * @return journalList:期刊列表@
      * @journalList title:标题 issn:issn editorinchief:editorinchief acceptance:acceptance finaldecision:finaldecision apc:apc
-     * 
      */
     public function getJournalList(){
         $res = $this->journal_obj->field('j_journal.*,j_admin.realname realname')->join('j_admin','j_admin.admin_id = j_journal.editor_id','LEFT')->where('j_journal.state',0)->order('j_journal.sort desc')->select();
@@ -61,7 +59,6 @@ class Journal extends Controller  {
      * @param name:editor_id type:int require:1 desc:编辑id
      * @param name:system_color type:string require:1
      * @param name:submission_url type:string require:1
-     * 
      */
     public function addJournal(){
         $data = $this->request->post();
@@ -83,8 +80,7 @@ class Journal extends Controller  {
             return json(['code'=>1,'msg'=>'system error']);
         }
     }
-    
-    
+     
     /**
      * @title 获取期刊详情
      * @description 获取期刊详情
@@ -95,7 +91,6 @@ class Journal extends Controller  {
      * @param name:journal_id require:1 desc:主键
      * 
      * @return 
-     * 
      */
     public function getJournalDetail(){
 //        $data = $this->request->post();
@@ -113,7 +108,6 @@ class Journal extends Controller  {
      * @method POST
      * 
      * @param name:journal_id require:1 desc:主键
-     * 
      */
     public function delJournal(){
         $data = $this->request->post();
@@ -144,7 +138,6 @@ class Journal extends Controller  {
      * @param name:editor_id type:int require:1 desc:编辑id
      * @param name:system_color type:string require:1
      * @param name:submission_url type:string require:1
-     * 
      */
     public function editJournalDetail(){
         $data = $this->request->post();
@@ -165,7 +158,6 @@ class Journal extends Controller  {
         }else{
             return json(['code'=>1,'msg'=>'Please confirm you have changed the journal information.']);
         }
-        
     }
     
     /**
@@ -175,10 +167,8 @@ class Journal extends Controller  {
      * @url /master/Journal/getEditorList
      * @method POST
      * 
-     * 
      * @return editorList:编辑列表@
      * @editorList account:账号 realname:真实姓名 role:角色代号（0admin1editor） 
-     * 
      */
     public function getEditorList(){
         $editor_list = $this->admin_obj->where('role',1)->select();
@@ -194,9 +184,7 @@ class Journal extends Controller  {
      * 
      * @param name:name type:string require:1 default:journalicon desc:文件域名称
      * 
-     * 
      * @return upurl:图片地址
-     * 
      */
     public function up_file() {
         $file = request()->file('journalicon');
@@ -223,7 +211,6 @@ class Journal extends Controller  {
      * @param name:icon type:string require:1 desc:缩略图
      * @param name:is_final type:int require:1 desc:是否终结点（0no1yes）
      * @param name:sort type:int require:1 default:0 desc:权重
-     * 
      */
     public function addTopic(){
         $data = $this->request->post();
@@ -261,7 +248,6 @@ class Journal extends Controller  {
      * @param name:icon type:string require:1 desc:缩略图
      * @param name:is_final type:int require:1 desc:是否终结点（0no1yes）
      * @param name:sort type:int require:1 default:0 desc:权重
-     * 
      */
     public function editTopic(){
         $data = $this->request->post();
@@ -281,7 +267,6 @@ class Journal extends Controller  {
      * @method POST
      * 
      * @param name:journal_topic_id type:int require:1 desc:主键
-     * 
      */
     public function delTopic(){
         $data = $this->request->post();
@@ -338,7 +323,6 @@ class Journal extends Controller  {
         }
         return json(['code'=>0,'msg'=>'success','data'=>['parentList'=>$fff]]);
     }
-    
     private function getpChieldarr($vv,$res){
         if($vv['is_final']==1){
             return $vv;
@@ -365,7 +349,6 @@ class Journal extends Controller  {
      * @return journal:array#
      * @return topicList:话题数组@
      * @topicList array:数据
-     * 
      */
     public function getTopicList(){
         $data = $this->request->post();
@@ -386,8 +369,6 @@ class Journal extends Controller  {
         }
         return json(['code'=>0,'msg'=>'success','data'=>['journal'=>$journal_info,'topicList'=>$frag]]);
     }
-    
-    
     private function getChieldarr($vv,$res){
         if($vv['is_final']==1){
             return $vv;
@@ -400,7 +381,6 @@ class Journal extends Controller  {
         return $vv;
     }
     
-    
     /**
      * @title topic图片上传
      * @description topic图片上传
@@ -410,9 +390,7 @@ class Journal extends Controller  {
      * 
      * @param name:name type:string require:1 default:journaltopic desc:文件域名称
      * 
-     * 
      * @return upurl:图片地址
-     * 
      */
     public function up_topic_file() {
         $file = request()->file('journaltopic');
@@ -435,7 +413,6 @@ class Journal extends Controller  {
      * 
      * @param name:journal_id type:int require:1 desc:期刊id
      * @param name:stage_name type:string require:1 desc:期刊分期名
-     * 
      */
     public function addStage(){
         $data = $this->request->post();
@@ -458,13 +435,14 @@ class Journal extends Controller  {
      * 
      * @param name:journal_id type:int require:1 desc:期刊id
      * 
+     * @return journal:array#
      * @return stage_list:array#
-     * 
      */
     public function getStageList(){
         $data = $this->request->post();
+        $journal_info = $this->journal_obj->where('journal_id',$data['journal_id'])->find();
         $stage_list = $this->journal_stage_obj->where('journal_id',$data['journal_id'])->where('state',0)->select();
-        return json(['code'=>0,'msg'=>'success','data'=>['stage_list'=>$stage_list]]);
+        return json(['code'=>0,'msg'=>'success','data'=>['journal'=>$journal_info,'stage_list'=>$stage_list]]);
     }
     
     /**
@@ -475,7 +453,6 @@ class Journal extends Controller  {
      * @method POST
      * 
      * @param name:journal_stage_id type:int require:1 desc:期刊分期id
-     * 
      */
     public function delStage(){
         $data = $this->request->post();
@@ -496,7 +473,6 @@ class Journal extends Controller  {
      * 
      * @param name:journal_stage_id type:int require:1 desc:期刊分期id
      * @param name:stage_name type:string require:1 desc:期刊分期名字
-     * 
      */
     public function editStage(){
         $data = $this->request->post();