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

1

Browse Source
This commit is contained in:
wangjinlei
2023-07-31 16:53:58 +08:00
parent c88bc01c81
commit a009f4d961
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/master/controller/Article.php
View File

@@ -1068,7 +1068,7 @@ class Article extends Controller
$where['j_article.state'] = 0;
$journal_info = $this->journal_obj->where('issn', $data['issn'])->find();
$where['j_article.journal_id'] = $journal_info['journal_id'];
if (intval($data['journal_stage_id']) !== 0) {
if (isset($data['journal_stage_id'])&&intval($data['journal_stage_id']) !== 0) {
$where['j_article.journal_stage_id'] = $data['journal_stage_id'];
}
if (isset($data['seach']) && $data['seach'] != '') {
@@ -1100,7 +1100,8 @@ class Article extends Controller
$article_list[$k]['med_title'] = '';
$article_list[$k]['med_ename'] = '';
}
$article_list[$k]['mains'] = getArticleMains($v['article_id']);
$cm = $this->article_main_obj->where('article_id',$v['article_id'])->where('state',0)->find();
$article_list[$k]['mains'] = $cm?1:0;
}
$count = $this->article_obj
->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'], ['j_journal', 'j_journal.journal_id=j_article.journal_id', 'LEFT']))
@@ -1108,6 +1109,19 @@ class Article extends Controller
return json(['code' => 0, 'msg' => 'success', 'data' => ['count' => $count, 'articleList' => $article_list]]);
}
public function getArticleMainsForSubmit(){
$data = $this->request->post();
$rule = new Validate([
"article_id"=>'require'
]);
if(!$rule->check($data)){
return jsonError($rule->getError());
}
$mains = getArticleMains($data['article_id']);
$re['mains'] = $mains;
return jsonSuccess($re);
}
public function getArticleMainsForSubmission(){
$data = $this->request->post();

17
application/master/controller/Datebase.php
View File

@@ -499,11 +499,6 @@ class Datebase extends Controller
$data = $this->request->post();
$stage_info = $this->journal_stage_obj->where("journal_stage_id", $data["journal_stage_id"])->find();
$this->createEmailFile($data["journal_stage_id"]);
// 发送ftp
$this->createFtpFileInfo($data["journal_stage_id"]);
//发送sftp
$this->bf_db_push($data["journal_stage_id"]);
$journal_info = $this->journal_obj->where("journal_id", $stage_info["journal_id"])->find();
$zipfile = ROOT_PATH . "public/dataFile/" . $data["journal_stage_id"] . '/' . $data["journal_stage_id"] . '.zip';
@@ -540,6 +535,11 @@ class Datebase extends Controller
Queue::push('app\api\job\mail@puchAndFJ', $cdata, "mail");
// sendEmail_data($v, "Data submitted-TMR Publishing Group", "Data submitted-TMR Publishing Group", $tt, $journal_info['email'], $journal_info['epassword'],$zipfile);
}
//发送sftp
$this->bf_db_push($data["journal_stage_id"]);
// 发送ftp
$this->createFtpFileInfo($data["journal_stage_id"]);
return jsonSuccess([]);
}
@@ -573,6 +573,7 @@ class Datebase extends Controller
}
private function createEmailFile($journal_stage_id)
{
$url = "http://ts.tmrjournals.com/api/dataApi/createTemplate";
@@ -604,11 +605,13 @@ class Datebase extends Controller
copy('http://ts.tmrjournals.com/upload/' . $file, $base_dir . '/' . $stage_info["journal_stage_id"] . ".docx");
$zip->addFile($base_dir . '/' . $stage_info["journal_stage_id"] . ".docx", "Contents.docx");
foreach ($alist as $k => $v) {
copy("https://www.tmrjournals.com/public/articlePDF/" . $v['file_pdf'], $base_dir . '/' . $v["npp"] . ".pdf");
// echo "https://www.tmrjournals.com/public/articlePDF/" . $v['file_pdf'];
// copy("https://www.tmrjournals.com/public/articlePDF/" . $v['file_pdf'], $base_dir . '/' . $v["npp"] . ".pdf");
copy("http://journalapi.tmrjournals.com/public/articlePDF/" . $v['file_pdf'], $base_dir . '/' . $v["npp"] . ".pdf");
$zip->addFile($base_dir . '/' . $v["npp"] . ".pdf", $v["npp"] . ".pdf");
}
//添加封面图片
copy("https://www.tmrjournals.com/public/" . $stage_info["stage_icon"], $base_dir . "/journal.jpg");
copy("http://journalapi.tmrjournals.com/public/" . $stage_info["stage_icon"], $base_dir . "/journal.jpg");
$zip->addFile($base_dir . "/journal.jpg", "journal.jpg");
$zip->close();
}