From b6456b3833741c5ff1026f8f5f0c821b279aeb15 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 18 Nov 2020 09:20:03 +0800
Subject: [PATCH] 20201112

---
 application/master/controller/Article.php | 17 +++++++++++++++--
 application/master/controller/Journal.php | 22 +++++++++++++++++-----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php
index 7211f24..669c29f 100644
--- a/application/master/controller/Article.php
+++ b/application/master/controller/Article.php
@@ -26,8 +26,8 @@ class Article extends Controller {
     /**
      * @title 添加文章
      * @description 添加文章
-     * @author wangjinlei
-     * @url /master/Journal/addArticle
+     * @author wangjinleichang
+     * @url /master/Article/addArticle
      * @method POST
      * 
      * @param name:journal_topic_id type:int require:1 desc:主键
@@ -36,5 +36,18 @@ class Article extends Controller {
         
     }
     
+    /**
+     * @title 获取文章列表
+     * @description 获取文章列表
+     * @author wangjinleichang
+     * @url /master/Article/getArticleList
+     * @method POST
+     * 
+     * @param name:journal_topic_id type:int require:1 desc:主键
+     */
+    public function getArticleList(){
+        
+    }
+    
     
 }
diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index 8bdf312..ead8ce9 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -412,12 +412,20 @@ class Journal extends Controller  {
      * @method POST
      * 
      * @param name:journal_id type:int require:1 desc:期刊id
-     * @param name:stage_name type:string require:1 desc:期刊分期名
+     * @param name:stage_year type:string require:1 desc:分期年份
+     * @param name:stage_vol type:int require:1 desc:分期卷数
+     * @param name:stage_no type:int require:1 desc:分期号码
+     * @param name:stage_page type:string require:1 desc:分期页码
+     * @param name:issue_date type:string require:1 desc:发布时间
      */
     public function addStage(){
         $data = $this->request->post();
         $insert_data['journal_id'] = $data['journal_id'];
-        $insert_data['stage_name'] = $data['stage_name'];
+        $insert_data['stage_year'] = $data['stage_year'];
+        $insert_data['stage_vol'] = $data['stage_vol'];
+        $insert_data['stage_no'] = $data['stage_no'];
+        $insert_data['stage_page'] = $data['stage_page'];
+        $insert_data['issue_date'] = $data['issue_date'];
         $res = $this->journal_stage_obj->insert($insert_data);
         if($res){
             return json(['code'=>0,'msg'=>'success']);
@@ -441,7 +449,7 @@ class Journal extends Controller  {
     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();
+        $stage_list = $this->journal_stage_obj->where('journal_id',$data['journal_id'])->where('state',0)->order('journal_stage_id desc')->select();
         return json(['code'=>0,'msg'=>'success','data'=>['journal'=>$journal_info,'stage_list'=>$stage_list]]);
     }
     
@@ -472,11 +480,15 @@ class Journal extends Controller  {
      * @method POST
      * 
      * @param name:journal_stage_id type:int require:1 desc:期刊分期id
-     * @param name:stage_name type:string require:1 desc:期刊分期名字
+     * @param name:stage_year type:string require:1 desc:分期年份
+     * @param name:stage_vol type:int require:1 desc:分期卷数
+     * @param name:stage_no type:int require:1 desc:分期号码
+     * @param name:stage_page type:string require:1 desc:分期页码
+     * @param name:issue_date type:string require:1 desc:发布时间
      */
     public function editStage(){
         $data = $this->request->post();
-        $res = $this->journal_stage_obj->where('journal_stage_id',$data['journal_stage_id'])->update(['stage_name'=>$data['stage_name']]);
+        $res = $this->journal_stage_obj->update($data);
         if($res){
             return json(['code'=>0,'msg'=>'success']);
         }else{