diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 696b0482..62868ffc 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -282,6 +282,51 @@ UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695 ALTER TABLE `laws_domestic_standard` MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期'; +-- 2024-09-04 条款添加标题译文 +ALTER TABLE laws_document_split ADD title_translation longtext NULL DEFAULT NULL COMMENT '标题译文'; +INSERT INTO `laws_tag`(`id`, `table_name`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_show_form_create`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `del_flag`, `is_model`, `dict_id`, `home_search_context_order`, `home_search_file_order`, `dict_field_search`, `dict_table_search`, `dict_text_search`, `usable_range`, `tree_first_href`, `import_sort`) VALUES ('1701142687771348923', 'laws_document_split', 'title_translation', 'Title Translation', '标题译文', 3, 'title_translation', 0, 1, 'String', 500, NULL, NULL, NULL, NULL, NULL, '9', NULL, NULL, NULL, '0', NULL, NULL, 1, 1, 1, 1, 1, NULL, NULL, NULL, 'admin', '2023-10-30 13:36:07', '2023-09-11 15:56:37', 'admin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0, '4', NULL, NULL, NULL, NULL, NULL, NULL, '1,3', NULL, 2); +UPDATE `laws_tag` SET `order_num` = 1 WHERE `id` = '1701135939543060481'; +UPDATE `laws_tag` SET `order_num` = 3 WHERE `id` = '1701142687771348923'; +UPDATE `laws_tag` SET `order_num` = 2 WHERE `id` = '1701142687771348993'; +UPDATE `laws_tag` SET `order_num` = 4 WHERE `id` = '1701142955053371394'; +UPDATE `laws_tag` SET `order_num` = 37 WHERE `id` = '1701143354573410306'; +UPDATE `laws_tag` SET `order_num` = 6 WHERE `id` = '1701143354573410307'; +UPDATE `laws_tag` SET `order_num` = 36 WHERE `id` = '1701143547972767745'; +UPDATE `laws_tag` SET `order_num` = 8 WHERE `id` = '1701143773534048258'; +UPDATE `laws_tag` SET `order_num` = 10 WHERE `id` = '1701144097372065792'; +UPDATE `laws_tag` SET `order_num` = 11 WHERE `id` = '1701144097372065793'; +UPDATE `laws_tag` SET `order_num` = 9 WHERE `id` = '1702535708790255617'; +UPDATE `laws_tag` SET `order_num` = 12 WHERE `id` = '1702536307267104770'; +UPDATE `laws_tag` SET `order_num` = 13 WHERE `id` = '1702557948281909249'; +UPDATE `laws_tag` SET `order_num` = 7 WHERE `id` = '1702557948281909251'; +UPDATE `laws_tag` SET `order_num` = 14 WHERE `id` = '1702559481136443393'; +UPDATE `laws_tag` SET `order_num` = 15 WHERE `id` = '1702559711416315906'; +UPDATE `laws_tag` SET `order_num` = 29 WHERE `id` = '1702562405354860546'; +UPDATE `laws_tag` SET `order_num` = 30 WHERE `id` = '1702562652072210433'; +UPDATE `laws_tag` SET `order_num` = 31 WHERE `id` = '1702563066486222849'; +UPDATE `laws_tag` SET `order_num` = 32 WHERE `id` = '1702564129947807745'; +UPDATE `laws_tag` SET `order_num` = 33 WHERE `id` = '1702565972367142914'; +UPDATE `laws_tag` SET `order_num` = 5 WHERE `id` = '1702566560811216898'; +UPDATE `laws_tag` SET `order_num` = 28 WHERE `id` = '1714171694923517953'; +UPDATE `laws_tag` SET `order_num` = 38 WHERE `id` = '1714171694923517954'; +UPDATE `laws_tag` SET `order_num` = 34 WHERE `id` = '1803335200562876416'; +UPDATE `laws_tag` SET `order_num` = 16 WHERE `id` = '1803335200567070720'; +UPDATE `laws_tag` SET `order_num` = 17 WHERE `id` = '1803335200567070721'; +UPDATE `laws_tag` SET `order_num` = 18 WHERE `id` = '1803335200567070722'; +UPDATE `laws_tag` SET `order_num` = 19 WHERE `id` = '1803335200567070723'; +UPDATE `laws_tag` SET `order_num` = 20 WHERE `id` = '1803335200571265024'; +UPDATE `laws_tag` SET `order_num` = 21 WHERE `id` = '1803335200571265025'; +UPDATE `laws_tag` SET `order_num` = 22 WHERE `id` = '1803335200571265026'; +UPDATE `laws_tag` SET `order_num` = 23 WHERE `id` = '1803335200571265027'; +UPDATE `laws_tag` SET `order_num` = 24 WHERE `id` = '1803335200571265028'; +UPDATE `laws_tag` SET `order_num` = 25 WHERE `id` = '1803335200571265029'; +UPDATE `laws_tag` SET `order_num` = 26 WHERE `id` = '1803335200571265030'; +UPDATE `laws_tag` SET `order_num` = 27 WHERE `id` = '1803335200571265031'; +UPDATE `laws_tag` SET `order_num` = 35 WHERE `id` = '1803335200571265032'; + +-- 2024-09-05 修改条款拆分表字段长度 +ALTER TABLE laws_document_split MODIFY COLUMN regulatory_notes longtext NULL DEFAULT NULL COMMENT '法规注释'; + -- 2024-09-05 修改字段名称 UPDATE `laws_tag` SET `db_field_en_name` = 'DEFMA', `db_field_txt` = 'DEFMA' WHERE `id` = '1803335200571265026'; -- 2024-09-05 法规符合性排查流程节点名称更改 diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/ApplicationCommandLine.java b/laws-base/laws-base-core/src/main/java/com/jero/config/ApplicationCommandLine.java new file mode 100644 index 00000000..414084ee --- /dev/null +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/ApplicationCommandLine.java @@ -0,0 +1,24 @@ +package com.jero.config; + +import org.apache.poi.ss.SpreadsheetVersion; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +import java.lang.reflect.Field; + +/** + * 解决导出excel单元格长度过长问题 + * @version 1.0 + * @date 2024/9/5 15:16 + */ +@Component +public class ApplicationCommandLine implements CommandLineRunner { + @Override + public void run(String... args) throws Exception { + SpreadsheetVersion spreadsheetVersion = SpreadsheetVersion.EXCEL2007; + Field maxTextLength = spreadsheetVersion.getClass().getDeclaredField("_maxTextLength"); + maxTextLength.setAccessible(true); + maxTextLength.set(spreadsheetVersion, Integer.MAX_VALUE); + } +} + diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/xss/SqlFilter.java b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/xss/SqlFilter.java index e71f5f1b..eb39d65f 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/xss/SqlFilter.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/xss/SqlFilter.java @@ -20,7 +20,7 @@ public class SqlFilter { return null; } - if (str.contains("itemContent") || str.contains("item_content")) { + if (str.contains("itemContent") || str.contains("item_content") || str.contains("detailInfoList")) { return str; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java index c430b683..5c820997 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java @@ -39,6 +39,12 @@ public class ProcessStandardInterpretClause extends BaseEntity { @TableField(exist = false) @Excel(name = "标准名称/条款标题", width = 18) private String itemTitle; + + /**标题译文*/ + @ApiModelProperty(value = "标题译文") + @TableField(exist = false) + @Excel(name = "标题译文", width = 18) + private String titleTranslation; /**条款内容*/ @ApiModelProperty(value = "条款内容") @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java index 9d2bdd8f..34e6609a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java @@ -39,6 +39,11 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { @TableField(exist = false) @Excel(name = "标准名称/条款标题", width = 18) private String itemTitle; + /**标题译文*/ + @ApiModelProperty(value = "标题译文") + @TableField(exist = false) + @Excel(name = "标题译文", width = 18) + private String titleTranslation; /**条款内容*/ @ApiModelProperty(value = "条款内容") @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml index 424717a3..5ab8afd3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml @@ -7,6 +7,7 @@ select * from (select psic.id, IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum, IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle, + lds2.title_translation titleTranslation, IF(lds.id is not null, null, lds2.item_content) itemContent, lds2.translation, standard_interpret_id, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml index a7bf7e86..20715101 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml @@ -49,6 +49,7 @@ left join (select psic.id interpret_clause_id, IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum, IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle, + lds2.title_translation titleTranslation, IF(lds.id is not null, null, lds2.item_content) itemContent, lds2.translation, standard_interpret_id diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index fc3c2d16..a785ec8a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -79,6 +79,7 @@ import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.SpreadsheetVersion; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -1083,7 +1084,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe exportList = BeanCopyUtils.copyBeanList(exportList2, ProcessStandardInterpretClauseSublist.class); } - // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); try { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java index 9fcb4c5c..fe655f79 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java @@ -24,6 +24,9 @@ public class LawsDocumentSplit extends BaseEntity { // 条文标题 @ApiModelProperty("条文标题") private String itemTitle; + // 条文标题 + @ApiModelProperty("标题译文") + private String titleTranslation; // 条文内容 @ApiModelProperty("条文内容") private String itemContent; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 50bc31b0..3dbcb421 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -50,7 +50,7 @@ INSERT INTO laws_document_split (id, create_by, create_time, update_by, update_time, sys_org_code, - is_same_as_prev_version, item_num, info_id, menu_id, item_title, item_content, translation, + is_same_as_prev_version, item_num, info_id, menu_id, item_title, title_translation, item_content, translation, change_description,regulatory_notes,part_name,key_controller,applicable_components,responsible_department,responsible_module, related_department,related_module,applications,power_type,domain_area,configuration_requirements,new_cer_implement_date, new_production_implementation,registration_date,enterprise_standard,technical_specification_design_guide,drawing_template, @@ -59,7 +59,7 @@ values (#{item.id}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.sysOrgCode}, - #{item.isSameAsPrevVersion},#{item.itemNum},#{item.infoId},#{item.menuId},#{item.itemTitle},#{item.itemContent}, + #{item.isSameAsPrevVersion},#{item.itemNum},#{item.infoId},#{item.menuId},#{item.itemTitle},#{item.titleTranslation},#{item.itemContent}, #{item.translation},#{item.changeDescription},#{item.regulatoryNotes}, #{item.partName},#{item.keyController},#{item.applicableComponents},#{item.responsibleDepartment}, #{item.responsibleModule},#{item.relatedDepartment},#{item.relatedModule},#{item.applications},#{item.powerType}, @@ -285,7 +285,7 @@ select * from SAR_FILE_SPLIT_MENU - where parent_id = #{parentId} AND valid_flag = '0' + where parent_id = #{parentId} + AND valid_flag = '0' + and display_seq > #{displaySeq} order by display_seq desc - limit 1