zm/journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20201112

Browse Source
This commit is contained in:
wangjinlei
2022-03-10 17:39:58 +08:00
parent bba9cbb937
commit a24c60f9c6
3 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/api/controller/Journal.php
View File

@@ -530,6 +530,17 @@ class Journal extends Controller {
$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]]);
}

7
application/api/controller/Main.php
View File

@@ -55,6 +55,11 @@ class Main extends Controller {
echo md5("S123456pnx");
}
public function mddd(){
echo md5("zhu18920435065");
}
/**
* @title 获取scients
* @description 获取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');

48
application/master/controller/Journal.php
View File

@@ -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图片上传