From 21f3aea0075943e87fbf06f31360c2619ce6439d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 18:11:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=89=88=E6=9C=AC=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index f5c10e0a..5f8add0a 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -577,5 +577,11 @@ ALTER TABLE `laws_document_split` ALTER TABLE `laws_document_split` MODIFY COLUMN `enterprise_standard` longtext NULL COMMENT '企业标准'; - - +-- 20241010 添加修改清单版本按钮 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, +`menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, + `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, + `status`, `internal_or_external`, `menu_en`, `app_id`, `home_icon`) VALUES ('897f89d7927493820192749382b60000', + '897f89d79014d7fe019014d7fe2e0000', '修改清单版本', NULL, NULL, NULL, NULL, 2, 'marketStandard:editVersion', '1', + 9.00, 0, NULL, 1, 1, 0, 0, NULL, 'ldq', '2024-10-10 11:57:57', 'ldq', '2024-10-10 11:58:06', 0, 0, '1', 0, + 'Modify list version', NULL, NULL); From a16e81235ed9c0e288b58f6b88458c4331182f0a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 11 Oct 2024 17:28:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20=E6=9D=A1=E6=AC=BE=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6<>=E8=BD=AC=E4=B8=BA<>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 838544e0..b527659d 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3543,8 +3543,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl", ">"); + String translation = valEO.getTranslation().replace("<", "<").replace(">", ">"); // 当前段内容 String valContent = ""; String valContentTranslation = ""; @@ -3598,7 +3598,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl", ">"); if (StringUtils.isBlank(str)) { map.put(key,value); }else { From fa69c6b0b5405e8c68fe289a894590b23c3dd977 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 12 Oct 2024 09:11:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=20=E6=9D=A1=E6=AC=BE=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6<>=E8=BD=AC=E4=B8=BA<>?= =?UTF-8?q?=E6=97=B6=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E8=A7=92=E6=A0=87=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index b527659d..9910c1f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3543,8 +3543,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl", ">"); - String translation = valEO.getTranslation().replace("<", "<").replace(">", ">"); + String itemContent = valEO.getItemContent().replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", ""); + String translation = valEO.getTranslation().replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", ""); // 当前段内容 String valContent = ""; String valContentTranslation = ""; From 6429834ed6202fbc0c34bbd95ba2344a78b8597e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 12 Oct 2024 09:41:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=20=E6=9D=A1=E6=AC=BE=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6<>=E8=BD=AC=E4=B8=BA<>?= =?UTF-8?q?=E6=97=B6=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E8=A7=92=E6=A0=87=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FileSplitItemsEOServiceImpl.java | 31 +++++++++++++++---- .../split/util/POIReadExcelToHtml.java | 2 +- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 9910c1f1..734a4fa7 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3543,18 +3543,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl", ">") - .replace("<sub>", "").replace("</sub>", "") - .replace("<sup>", "").replace("</sup>", ""); - String translation = valEO.getTranslation().replace("<", "<").replace(">", ">") - .replace("<sub>", "").replace("</sub>", "") - .replace("<sup>", "").replace("</sup>", ""); + String itemContent = valEO.getItemContent(); + String translation = valEO.getTranslation(); // 当前段内容 String valContent = ""; String valContentTranslation = ""; if ("TEXT".equals(type)) { + itemContent = itemContent.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", ""); valContent += "

" + itemContent + "

"; if (StringUtils.isNotBlank(translation)){ + translation = translation.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", ""); valContentTranslation += "

" + translation + "

"; } } else if ("IMG".equals(type)) { @@ -3563,9 +3565,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl"; } } else if ("TABLE".equals(type)) { + itemContent = itemContent.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", "") + .replace("<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">", "") + .replace("</table>", "
") + .replace("<tr>", "").replace("</tr>", "") + .replace("<td >", "").replace("</td>", "") + ; + valEO.setItemContent(itemContent.replaceAll("\n","
")); valContent += itemContent; if (StringUtils.isNotBlank(translation)){ + translation = translation.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", "") + .replace("<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">", "") + .replace("</table>", "
") + .replace("<tr>", "").replace("</tr>", "") + .replace("<td >", "").replace("</td>", "") + ; valEO.setTranslation(translation.replaceAll("\n","
")); valContentTranslation += translation; } diff --git a/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java b/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java index b12d42df..09c31f16 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java +++ b/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java @@ -107,7 +107,7 @@ public class POIReadExcelToHtml { } if (null == row) { - sb.append(" "); + sb.append(" "); continue; }else if(row.getZeroHeight()){ continue; From 630841d3c0537a1b8e6572acab6d8d65c44e48d5 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Sat, 12 Oct 2024 14:53:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[update]=20pdf=E4=BF=AE=E6=94=B9=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E5=AF=86=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev-chery.yml | 2 +- laws-single-startup/src/main/resources/application-dev.yml | 2 +- laws-single-startup/src/main/resources/application-prod.yml | 2 +- laws-single-startup/src/main/resources/application-test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/laws-single-startup/src/main/resources/application-dev-chery.yml b/laws-single-startup/src/main/resources/application-dev-chery.yml index 650f428e..1322648d 100644 --- a/laws-single-startup/src/main/resources/application-dev-chery.yml +++ b/laws-single-startup/src/main/resources/application-dev-chery.yml @@ -485,7 +485,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度 diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 2ca34c8d..7ea4ff97 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -480,7 +480,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度 diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml index 668b4063..71fca51a 100644 --- a/laws-single-startup/src/main/resources/application-prod.yml +++ b/laws-single-startup/src/main/resources/application-prod.yml @@ -486,7 +486,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度 diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index b26f1285..9c4e989b 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -485,7 +485,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度