From a24c60f9c60189e2ffb2d39417ed1672350b1ca0 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 10 Mar 2022 17:39:58 +0800 Subject: [PATCH] 20201112 --- application/api/controller/Journal.php | 11 ++++++ application/api/controller/Main.php | 7 +++- application/master/controller/Journal.php | 48 +++++++++++++++++++---- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php index eb53ab6..b710149 100644 --- a/application/api/controller/Journal.php +++ b/application/api/controller/Journal.php @@ -529,6 +529,17 @@ class Journal extends Controller { $list[$k]['cite'] = $cite; $list[$k]['authortitle'] = $this->getAuthor($v); } + + //连续出版判断，决定是否显示出版时间 + foreach ($list as $k => $v){ + $ca_stage = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find(); + if(($v['journal_id']==2&&$ca_stage['stage_year']>=2022)||($v['journal_id']==18&&$ca_stage['stage_year']>=2022)||($v['journal_id']==17&&$ca_stage['stage_year']>=2019)){ + $list[$k]['isShowOtime'] = 1; + }else{ + $list[$k]['isShowOtime'] = 0; + } + } + return json(['code' => 0, 'msg' => 'success', 'data' => ['stage' => $stage_info, 'articleList' => $list]]); } diff --git a/application/api/controller/Main.php b/application/api/controller/Main.php index 820b536..59b53b5 100644 --- a/application/api/controller/Main.php +++ b/application/api/controller/Main.php @@ -54,6 +54,11 @@ class Main extends Controller { // return jsonSuccess(['aa'=>'wjl']); echo md5("S123456pnx"); } + + + public function mddd(){ + echo md5("zhu18920435065"); + } /** * @title 获取scients @@ -361,7 +366,7 @@ class Main extends Controller { // $push_url = 'http://www.journal.com/api/Main/getImgFile'; //定义需要查询同化的数组 - $list = ['articleCite','articlePDF','articleicon','articleSUB','articleSUB2','baseTopic','journalCfp','journalfooter','journalicon','journalline','rotation','journaltopic','specialIcon','system','articleCDF']; + $list = ['articleCite','articlePDF','articleicon','articleSUB','boardIcon','articleSUB2','baseTopic','journalCfp','journalfooter','journalicon','journalline','rotation','journaltopic','specialIcon','system','articleCDF']; foreach ($list as $v){ $dir = $root_url."public/".$v."/".date('Ymd'); diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php index 3067467..d81d569 100644 --- a/application/master/controller/Journal.php +++ b/application/master/controller/Journal.php @@ -378,6 +378,8 @@ class Journal extends Controller { * @param name:website type:string require:1 desc:个人主页地址 * @param name:dr type:string require:1 desc:学位 * @param name:title type:string require:1 desc:职称 + * @param name:field type:string require:1 desc:领域描述 + * @param name:board_icon type:string require:1 desc:编委头像地址 * @param name:address type:string require:1 desc:单位 * @param name:country type:string require:1 desc:国家 * @param name:board_group_id type:int require:1 desc:编委分组id @@ -386,12 +388,14 @@ class Journal extends Controller { $data = $this->request->post(); $insert['journal_id'] = $data['journal_id']; $insert['type'] = $data['type']; - $insert['name'] = $data['name']; - $insert['website'] = $data['website']; + $insert['name'] = trim($data['name']); + $insert['website'] = trim($data['website']); $insert['dr'] = $data['dr']; + $insert['field'] = trim($data['field']); $insert['title'] = $data['title']; - $insert['address'] = $data['address']; - $insert['country'] = $data['country']; + $insert['address'] = trim($data['address']); + $insert['country'] = trim($data['country']); + $insert['board_icon'] = trim($data['board_icon']); $insert['board_group_id'] = $data['board_group_id']; $this->board_obj->insert($insert); return jsonSuccess([]); @@ -425,18 +429,22 @@ class Journal extends Controller { * @param name:website type:string require:1 desc:个人主页地址 * @param name:dr type:string require:1 desc:学位 * @param name:title type:string require:1 desc:职称 + * @param name:field type:string require:1 desc:领域描述 * @param name:address type:string require:1 desc:单位 + * @param name:board_icon type:string require:1 desc:编委头像 * @param name:country type:string require:1 desc:国家 * @param name:board_group_id type:int require:1 desc:编委分组id */ public function editBoard(){ $data = $this->request->post(); $insert['type'] = $data['type']; - $insert['name'] = $data['name']; - $insert['website'] = $data['website']; + $insert['name'] = trim($data['name']); + $insert['website'] = trim($data['website']); $insert['dr'] = $data['dr']; - $insert['title'] = $data['title']; - $insert['address'] = $data['address']; + $insert['title'] = trim($data['title']); + $insert['field'] = trim($data['field']); + $insert['address'] = trim($data['address']); + $insert['board_icon'] = trim($data['board_icon']); $insert['country'] = $data['country']; $insert['board_group_id'] = $data['board_group_id']; @@ -930,6 +938,30 @@ class Journal extends Controller { } } + + /** + * @title 编委头像上传 + * @description 编委头像上传 + * @author wangjinlei + * @url /master/Journal/up_board_file + * @method POST + * + * @param name:name type:string require:1 default:boardIcon desc:文件域名称 + * + * @return upurl:图片地址 + */ + public function up_board_file() { + $file = request()->file('boardIcon'); + if ($file) { + $info = $file->move(ROOT_PATH . 'public' . DS . 'boardIcon'); + if ($info) { + return json(['code'=>0 , 'msg'=>'success', 'upurl' => str_replace("\\", "/", $info->getSaveName())]); + } else { + return json(['code' => 1, 'msg' => $file->getError()]); + } + } + } + /** * @title line图片上传 * @description line图片上传