判断是否是草稿箱

application/api/controller/Article.php

@@ -129,6 +129,12 @@ class Article extends Base
                 }
             }
             $res[$key]['proof'] = $proof_state;
+            //新增是否是草稿删除 20260204 start
+            $res[$key]['is_draft'] = 2;
+            if(!empty($val['accept_sn']) && substr($val['accept_sn'], 0, 5) === 'Draft'){
+                $res[$key]['is_draft'] = 1;
+            }
+            //新增是否是草稿删除 20260204 end
         }
 
         //返回数据
@@ -585,6 +591,14 @@ class Article extends Base
             }
         }
         //查询终审意见 chengxiaoling 20250828 end
+         //新增是否是草稿删除 20260204 start
+        if(!empty($article_res)){
+            $article_res['is_draft'] = 2;
+            if(!empty($article_res['accept_sn']) && substr($article_res['accept_sn'], 0, 5) === 'Draft'){
+                $article_res['is_draft'] = 1;
+            }
+        }
+        //新增是否是草稿删除 20260204 end
         return json(['article' => $article_res, 'msg' => $article_msg, 'authors' => $author_res, 'suggest' => $suggest, 'transfer' => $transfer_res, 'transinfo' => $transfer_info, "major" => $major,'suggest_final' => $aFinal]);
     }
 

application/api/controller/Finalreview.php

@@ -1167,9 +1167,17 @@ class Finalreview extends Base
         if(empty($aReviewerFinal)){
             return json_encode(['status' => 3,'msg' => 'Review record does not exist or review has been completed']);
         }
+        //查询审稿人基本信息
         $aWhere = ['user_id' => $iReviewerId];
-        $aUser = Db::name('user')->field('realname')->where($aWhere)->find();
+        $aUser = Db::name('user')->field('realname,email')->where($aWhere)->find();
         $aReviewerFinal['realname'] = empty($aUser['realname']) ? '' : $aUser['realname'];
+        $aReviewerFinal['email'] = empty($aUser['email']) ? '' : $aUser['email'];
+        //查询审稿人机构
+        if(!empty($aUser)){
+            $aWhere = ['reviewer_id' => $iReviewerId,'state' => 0];
+            $aReviewerInfo = Db::name('user_reviewer_info')->field('company')->where($aWhere)->find();
+            $aReviewerFinal['company'] = empty($aReviewerInfo['company']) ? '' : $aReviewerInfo['company'];
+        }
         return json_encode(['status' => 1,'msg' => 'success','data' => $aReviewerFinal]);
     }
 

application/api/controller/Preaccept.php

@@ -45,6 +45,12 @@ class Preaccept extends Base
             }else{
                 $list[$k]['is_repeat'] = 0;
             }
+            if(strpos($v['refer_content'],'retraction')!==false||strpos($v['refer_content'],'retracted')!==false){
+                $list[$k]['retract'] = 1;
+            }else{
+                $list[$k]['retract'] = 0;
+            }
+
         }
         $re["refers"] = $list;
         $re['repeat'] = empty($aRepeat) ? [] : $aRepeat;

application/api/controller/Production.php

@@ -632,6 +632,11 @@ class Production extends Base
             } else {
                 $list[$k]['is_repeat'] = 0;
             }
+            if(strpos($v['refer_content'],'retraction')!==false||strpos($v['refer_content'],'retracted')!==false){
+                $list[$k]['retract'] = 1;
+            }else{
+                $list[$k]['retract'] = 0;
+            }
         }
         $re['refers'] = $list;
         $re['repeat'] = empty($aRepeat) ? [] : $aRepeat;
@@ -2243,9 +2248,15 @@ class Production extends Base
             return jsonError($rule->getError());
         }
         $info = $this->article_main_obj->where("am_id",$data['id'])->find();
+        if(isset($data["code"])){
+            $content = $data['code'];
+        }else{
+            $content = $info['content'];
+        }
+
         $production_info = $this->production_article_obj->where("article_id",$info['article_id'])->find();
         $refers = $this->production_article_refer_obj->where("p_article_id",$production_info['p_article_id'])->where('state',0)->order("index")->select();
-        $res = $this->convertToLatex($info['content'],$refers);
+        $res = $this->convertToLatex($content,$refers);
         echo $res;
 //        return jsonSuccess([$res]);
     }
@@ -2259,9 +2270,9 @@ class Production extends Base
             return '';
         }
         //单行处理公式内容
-        $pattern = '/^<wmath\s+data-latex="([^"]*)">.*<\/wmath>$/';
+        $pattern = '/^<wmath[^>]*?\s+data-latex="([^"]*)"[^>]*?>.*?<\/wmath>$/';
         if(preg_match($pattern, $content) === 1){
-            $pattern1 = '/<wmath\s+data-latex="([^"]*)">/';
+            $pattern1 = '/<wmath[^>]*?\s+data-latex="([^"]*)">/';
             if (preg_match($pattern1, $content, $matches)) {
                 $latexContent = $matches[1];
                 // 将 $$ 转换为 $，因为equation环境不需要$$

application/common/LatexContent.php

@@ -258,6 +258,7 @@ page={{stage_page}},%号
         //查询正文信息
         $aWhere = ['article_id' => $aProductionArticle['article_id'],'state' => 0];
         $aArticleMain = Db::name('article_main')->field('am_id,article_id,type,content,ami_id,amt_id,is_h1,is_h2,is_h3,sort')->where($aWhere)->order('sort')->select();
+
         if(!empty($aArticleMain)){
 
             //查询图片
@@ -308,7 +309,13 @@ page={{stage_page}},%号
                     }
                     if($value['is_h1'] == 0 && $value['is_h2'] == 0 && $value['is_h3'] == 0){
                         if($value['type'] == 0 ){
-                            $sMain .= $this->dealContent($value['content'],$aReferences)."\\par\n";
+                            //处理内容
+                            $sMainContent = $this->dealContent($value['content'],$aReferences);
+                            //替换myh3标签
+                            $contentpattern = '/<myh3>(.*?)<\/myh3>/is';
+                            $contentreplacement = '\\subsubsection{$1}';
+                            $sMainContent = preg_replace($contentpattern, $contentreplacement, $sMainContent);
+                            $sMain .= $sMainContent."\\par\n";
                         }
                         if($value['type'] == 1 ){//图片
                             $aImageInfo = empty($aArticleMainImage[$value['ami_id']]) ? [] : $aArticleMainImage[$value['ami_id']];
@@ -355,7 +362,6 @@ page={{stage_page}},%号
                 }
             }
         }
-
         $aSearch['{{article_main}}'] = empty($sMain) ? '' : $sMain."\n";
         //模版内容替换
         $sTemplateInfo = str_replace(array_keys($aSearch), array_values($aSearch), $sTemplateInfo);