QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into SecondStage

Browse Source
This commit is contained in:
fengchenchen
2024-10-12 17:31:34 +08:00
parent a641540e4d 9846618535
commit d9bbc140d9
7 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update/测试阶段.sql
+8 -2
View File
@@ -581,5 +581,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);
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+24 -1
View File
@@ -3549,8 +3549,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
String valContent = "";
String valContentTranslation = "";
if ("TEXT".equals(type)) {
itemContent = itemContent.replace("<", "&lt;").replace(">", "&gt;")
.replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
.replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>");
valContent += "<p>" + itemContent + "</p>";
if (StringUtils.isNotBlank(translation)){
translation = translation.replace("<", "&lt;").replace(">", "&gt;")
.replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
.replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>");
valContentTranslation += "<p>" + translation + "</p>";
}
} else if ("IMG".equals(type)) {
@@ -3559,9 +3565,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
valContentTranslation += "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\""+ translation +"\">";
}
} else if ("TABLE".equals(type)) {
itemContent = itemContent.replace("<", "&lt;").replace(">", "&gt;")
.replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
.replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>")
.replace("&lt;table border=\"1\" style=\"border-collapse:collapse;width:100%;\"&gt;", "<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">")
.replace("&lt;/table&gt;", "</table>")
.replace("&lt;tr&gt;", "<tr>").replace("&lt;/tr&gt;", "</tr>")
.replace("&lt;td &gt;", "<td>").replace("&lt;/td&gt;", "</td>")
;
valEO.setItemContent(itemContent.replaceAll("\n","<br/>"));
valContent += itemContent;
if (StringUtils.isNotBlank(translation)){
translation = translation.replace("<", "&lt;").replace(">", "&gt;")
.replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
.replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>")
.replace("&lt;table border=\"1\" style=\"border-collapse:collapse;width:100%;\"&gt;", "<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">")
.replace("&lt;/table&gt;", "</table>")
.replace("&lt;tr&gt;", "<tr>").replace("&lt;/tr&gt;", "</tr>")
.replace("&lt;td &gt;", "<td>").replace("&lt;/td&gt;", "</td>")
;
valEO.setTranslation(translation.replaceAll("\n","<br/>"));
valContentTranslation += translation;
}
@@ -3598,7 +3621,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if (StringUtils.isBlank(value)) {
continue;
}
String str = map.get(key).toString();
String str = map.get(key).toString().replace("<", "&lt;").replace(">", "&gt;");
if (StringUtils.isBlank(str)) {
map.put(key,value);
}else {
laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class POIReadExcelToHtml {
}
if (null == row) {
sb.append("<tr><td > </td></tr>");
sb.append("<tr><td> </td></tr>");
continue;
}else if(row.getZeroHeight()){
continue;
laws-single-startup/src/main/resources/application-dev-chery.yml
+1 -1
View File
@@ -485,7 +485,7 @@ download:
watermark:
font-size: 13.0
# 每页几行
lineNumPerPage: 8
lineNumPerPage: 4
# 每页几列
columnNumPerPage: 3
# 倾斜角度
laws-single-startup/src/main/resources/application-dev.yml
+1 -1
View File
@@ -480,7 +480,7 @@ download:
watermark:
font-size: 13.0
# 每页几行
lineNumPerPage: 8
lineNumPerPage: 4
# 每页几列
columnNumPerPage: 3
# 倾斜角度
laws-single-startup/src/main/resources/application-prod.yml
+1 -1
View File
@@ -486,7 +486,7 @@ download:
watermark:
font-size: 13.0
# 每页几行
lineNumPerPage: 8
lineNumPerPage: 4
# 每页几列
columnNumPerPage: 3
# 倾斜角度
laws-single-startup/src/main/resources/application-test.yml
+1 -1
View File
@@ -485,7 +485,7 @@ download:
watermark:
font-size: 13.0
# 每页几行
lineNumPerPage: 8
lineNumPerPage: 4
# 每页几列
columnNumPerPage: 3
# 倾斜角度