From 88593aa40ca1a5526f1b77f6da52c936119b6398 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 12 Jan 2026 17:37:13 +0800 Subject: [PATCH] latex update --- application/api/controller/Production.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php index c115049..3db7b7b 100644 --- a/application/api/controller/Production.php +++ b/application/api/controller/Production.php @@ -3332,8 +3332,8 @@ class Production extends Base public function myTableTest(){ - $references = $this->production_article_refer_obj->where("p_article_id",3401)->where("state",0)->order("index asc")->select(); - $res = $this->tableCovertLatex(1102,$references); + $references = $this->production_article_refer_obj->where("p_article_id",3328)->where("state",0)->order("index asc")->select(); + $res = $this->tableCovertLatex(1120,$references); echo $res; } @@ -3352,9 +3352,9 @@ class Production extends Base if (json_last_error() !== JSON_ERROR_NONE || !is_array($tableData) || empty($tableData)) { return "% 无效的JSON数据"; } - if(strlen($table_info['table_data'])>6000){ - return "执行附表程序"; - } +// if(strlen($table_info['table_data'])>6000){ +// return "执行附表程序"; +// } // 获取表格最大列数(遍历所有行,找到列数最大值,处理合并后列数变化的情况) $maxColCount = 0; @@ -3488,6 +3488,8 @@ class Production extends Base for ($a_r=1;$a_r<$rowspan;$a_r++){ $table[$rowIndex+$a_r][$currentCol] = ""; } + }else{ + $table[$rowIndex][$currentCol] = $cellContent; } // $cells[] = $cellContent;