From e8fbd07c261d759579bd5a405779bdcf2cfae06d Mon Sep 17 00:00:00 2001 From: chengxl Date: Tue, 13 May 2025 17:16:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=9F=E5=88=8A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/wechat/controller/Article.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/wechat/controller/Article.php b/application/wechat/controller/Article.php index c828362..2957804 100644 --- a/application/wechat/controller/Article.php +++ b/application/wechat/controller/Article.php @@ -74,7 +74,7 @@ class Article extends Controller */ private function _journal($iJournalId = 0){ $aWhere = ['journal_id' => $iJournalId,'state' => 0]; - $aJournal = Db::name('journal')->field('journal_id,title as journal_title,icon as journal_icon,usx as journal_usx,abstract as journal_content,jabbr,email as journal_email,issn')->where($aWhere)->find(); + $aJournal = Db::name('journal')->field('journal_id,title as journal_title,icon as journal_icon,usx as journal_usx,abstract as journal_content_english, abstract_chinese as journal_content,jabbr,email as journal_email,issn')->where($aWhere)->find(); return $aJournal; } From 8cdc73c28bd15bed92ee83fa5a8f665d68e45cc8 Mon Sep 17 00:00:00 2001 From: chengxl Date: Wed, 14 May 2025 14:11:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=B8=8D=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/wechat/controller/Article.php | 69 ++++++++++++----------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/application/wechat/controller/Article.php b/application/wechat/controller/Article.php index 2957804..837b199 100644 --- a/application/wechat/controller/Article.php +++ b/application/wechat/controller/Article.php @@ -96,44 +96,45 @@ class Article extends Controller $aWhere = ['article_id' => $iArticleId,'state' => 0,'is_report' => 1]; $aAuthor = Db::name('article_author')->field('article_author_id,first_name,last_name,author_country,email,article_id')->where($aWhere)->select(); - if(empty($aAuthor)){ - return []; - } + return $aAuthor; + // if(empty($aAuthor)){ + // return []; + // } - //查询文章作者机构 - $aAuthorId = array_column($aAuthor, 'article_author_id'); - $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_author_id' => ['in',$aAuthorId]]; - $aAuthorOrgan = Db::name('article_author_to_organ')->where($aWhere)->column('article_author_id,article_organ_id'); + // //查询文章作者机构 + // $aAuthorId = array_column($aAuthor, 'article_author_id'); + // $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_author_id' => ['in',$aAuthorId]]; + // $aAuthorOrgan = Db::name('article_author_to_organ')->where($aWhere)->column('article_author_id,article_organ_id'); - //查询组织机构名称 - if(!empty($aAuthorOrgan)){ - $aAuthorOrganId = array_values($aAuthorOrgan); - $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_organ_id' => ['in',$aAuthorOrganId]]; - $aOrgan = Db::name('article_organ')->where($aWhere)->column('article_organ_id,organ_name'); - } + // //查询组织机构名称 + // if(!empty($aAuthorOrgan)){ + // $aAuthorOrganId = array_values($aAuthorOrgan); + // $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_organ_id' => ['in',$aAuthorOrganId]]; + // $aOrgan = Db::name('article_organ')->where($aWhere)->column('article_organ_id,organ_name'); + // } - //数据整合 - $aAuthorInfo = []; - foreach($aAuthor as $key => $value){ - //作者姓名 - $sAuthorName = $value['last_name'].$value['first_name']; + // //数据整合 + // $aAuthorInfo = []; + // foreach($aAuthor as $key => $value){ + // //作者姓名 + // $sAuthorName = $value['last_name'].$value['first_name']; - //所属机构ID - $iOrganId = empty($aAuthorOrgan[$value['article_author_id']]) ? 0 : $aAuthorOrgan[$value['article_author_id']]; - if(empty($iOrganId)){ - $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']]; - continue; - } - //获取所属机构名称 - $sOrganName = empty($aOrgan[$iOrganId]) ? '' : $aOrgan[$iOrganId]; - if(empty($sOrganName)){ - $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']]; - continue; - } - $sOrganName = empty($sOrganName) ? '' : $sOrganName; - $aAuthorInfo[] = ['company' => $sOrganName,'author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']]; - } - return $aAuthorInfo; + // //所属机构ID + // $iOrganId = empty($aAuthorOrgan[$value['article_author_id']]) ? 0 : $aAuthorOrgan[$value['article_author_id']]; + // if(empty($iOrganId)){ + // $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']]; + // continue; + // } + // //获取所属机构名称 + // $sOrganName = empty($aOrgan[$iOrganId]) ? '' : $aOrgan[$iOrganId]; + // if(empty($sOrganName)){ + // $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']]; + // continue; + // } + // $sOrganName = empty($sOrganName) ? '' : $sOrganName; + // $aAuthorInfo[] = ['company' => $sOrganName,'author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']]; + // } + // return $aAuthorInfo; } } From 71f3e289beab5780c8c11526a9bc4daab008de6d Mon Sep 17 00:00:00 2001 From: chengxl Date: Wed, 14 May 2025 16:16:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=9F=E5=88=8A?= =?UTF-8?q?=E5=8A=A0=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/master/controller/Journal.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php index fbf2fdc..cf7122c 100644 --- a/application/master/controller/Journal.php +++ b/application/master/controller/Journal.php @@ -96,13 +96,24 @@ class Journal extends Controller /** * 获取全部期刊 */ + // public function getJournals() + // { + // $jouranls = $this->journal_obj->where('state', 0)->select(); + // $re['journals'] = $jouranls; + // return jsonSuccess($re); + // } public function getJournals() { - $jouranls = $this->journal_obj->where('state', 0)->select(); + //根据条件搜索 + $aParam = $this->request->post(); + $aWhere['state'] = 0; + if(!empty($aParam['issn'])){ + $aWhere['issn'] = ['in',$aParam['issn']]; + } + $jouranls = $this->journal_obj->where($aWhere)->select(); $re['journals'] = $jouranls; return jsonSuccess($re); } - /** * 获取分期通过期刊 */ From c2a0f534d428bbeaf46d0fab5c5b7f7e589a4351 Mon Sep 17 00:00:00 2001 From: chengxl Date: Thu, 15 May 2025 15:31:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9C=9F=E5=88=8A=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/wechat/controller/Article.php | 40 ++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/application/wechat/controller/Article.php b/application/wechat/controller/Article.php index 837b199..0cd83da 100644 --- a/application/wechat/controller/Article.php +++ b/application/wechat/controller/Article.php @@ -74,7 +74,7 @@ class Article extends Controller */ private function _journal($iJournalId = 0){ $aWhere = ['journal_id' => $iJournalId,'state' => 0]; - $aJournal = Db::name('journal')->field('journal_id,title as journal_title,icon as journal_icon,usx as journal_usx,abstract as journal_content_english, abstract_chinese as journal_content,jabbr,email as journal_email,issn')->where($aWhere)->find(); + $aJournal = Db::name('journal')->field('journal_id,title as journal_title,icon as journal_icon,usx as journal_usx,abstract as journal_content_english, abstract_chinese as journal_content,jabbr,email as journal_email,issn,publish_author,editor_qrcode')->where($aWhere)->find(); return $aJournal; } @@ -137,4 +137,42 @@ class Article extends Controller // return $aAuthorInfo; } + /** + * 更新期刊内容 + * @param article_id 文章ID + */ + public function updateJournal(){ + + //获取参数 + $aParam = $this->request->post(); + $sIssn = empty($aParam['issn']) ? '' :$aParam['issn'] ; + if(empty($sIssn)){ + return json_encode(array('status' => 2,'msg' => 'Please select an journal')); + } + + //查询期刊是否存在 + $aJournal = Db::name('journal')->where('issn',$sIssn)->find(); + if(empty($aJournal)){ + return json_encode(array('status' => 4,'msg' => 'The journal does not exist')); + } + $iJournalId = $aJournal['journal_id']; + + //更新字段 + $aFileds = ['journal_topic','abstract_chinese','publish_author','editor_qrcode']; + + foreach ($aFileds as $key => $value) { + if(isset($aParam[$value])){ + $aUpdate[$value] = empty($aParam[$value]) ? '' : addslashes(trim(htmlspecialchars($aParam[$value]))); + } + } + if(empty($aUpdate)){ + return json_encode(array('status' => 5,'msg' => 'update success')); + } + $result = Db::name('journal')->where('journal_id',$iJournalId)->limit(1)->update($aUpdate); + if($result === false){ + return json_encode(array('status' => 6,'msg' => 'Update failed')); + } + return json_encode(array('status' => 1,'msg' => 'update success')); + } + }