From b9e648ef2aa18df6809d911f3f54ad46156fdb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 4 Sep 2024 11:56:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=8B=86=E5=88=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=BC=96=E8=BE=91=E3=80=81=E5=A4=8D=E5=88=B6=E3=80=81?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=A4=8D=E5=88=B6=E3=80=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=B7=BB=E5=8A=A0=E6=A0=87=E9=A2=98=E8=AF=91?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 43 +++++++++++++++++++ .../impl/DocumentSplitServiceImpl.java | 3 ++ 2 files changed, 46 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 1f2b66df..27ad6bf9 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -281,3 +281,46 @@ update laws_tag set is_show_search = 1 where table_name = 'laws_document_split'; UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706'; 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_chery_dev`.`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'; + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index d354d142..97a84dc9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -156,6 +156,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { private static final String IDS = "ids"; private static final String ITEM_NUM = "item_num"; private static final String ITEM_TITLE = "item_title"; + private static final String TITLE_TRANSLATION = "title_translation"; private static final String ITEM_CONTENT = "item_content"; private static final String TRANSLATION = "translation"; private static final String IS_SAME_AS_PREV_VERSION = "is_same_as_prev_version"; @@ -847,6 +848,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { listMap.remove(0); // 合并数据（条文标题、条文内容、等全部字段） String title = firstData.get(ITEM_TITLE) + " " + mergeData(listMap, ITEM_TITLE, false); + String titleTranslation = firstData.get(TITLE_TRANSLATION) + " " + mergeData(listMap, TITLE_TRANSLATION, false); String content = firstData.get(ITEM_CONTENT) + mergeData(listMap, ITEM_CONTENT, false); listMap.add(0, firstData); String translation = firstData.get(TRANSLATION) + mergeData(listMap, TRANSLATION, false); @@ -882,6 +884,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { String updateByAndUpdateTime = new UniversalImpl().getUpdateByAndUpdateTime(); String updateSet = updateByAndUpdateTime + "," + ITEM_TITLE + " = " + "' "+ title + "'" + + "," + TITLE_TRANSLATION + " = " + "' "+ titleTranslation + "'" + "," + ITEM_CONTENT + " = " + "'" + content + "'" + "," + TRANSLATION + " = " + "'" + translation + "'" + "," + CHANGE_DESCRIPTION + " = " + "'" + changeDescription + "'" +