From 8a7c62a932fb28dde0d45199568c871a47437d44 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 14 Oct 2024 10:28:03 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BC=81=E6=A0=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B6=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8C=E5=AD=97=E5=85=B8-=20=E5=9C=A8=20La?= =?UTF-8?q?wsEnterpriseStandard=20=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20revisionType=20=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E8=A1=A8=E7=A4=BA=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20-=20=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=20esp=5Frevision=5Ftype=20=E5=AD=97?= =?UTF-8?q?=E5=85=B8=EF=BC=8C=E7=94=A8=E4=BA=8E=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=9A=84=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=20-=20=E4=B8=BA=E4=BC=81=E6=A0=87=E7=AE=A1=E7=90=86=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20-=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E7=9A=84=E6=9D=83=E9=99=90?= =?UTF-8?q?=20-=20=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/第二阶段.sql | 13 ++++++++++++- .../standard/entity/LawsEnterpriseStandard.java | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/db/第二阶段.sql b/db/第二阶段.sql index de24fd97..92831cc3 100644 --- a/db/第二阶段.sql +++ b/db/第二阶段.sql @@ -309,4 +309,15 @@ update process_model_node set sort = 7 where process_key = 'process-annual-init' -- 文件表新增字段 ALTER TABLE `oss_file` - ADD COLUMN `onl_id` varchar(36) NULL COMMENT 'onlyOffice关联Id 每次在线编辑生成一个 历史版本均用' AFTER `bind_id`; \ No newline at end of file + ADD COLUMN `onl_id` varchar(36) NULL COMMENT 'onlyOffice关联Id 每次在线编辑生成一个 历史版本均用' AFTER `bind_id`; + +-- 添加查看征求意见按钮权限 +INSERT INTO sys_permission (id, parent_id, name, menu_en, perms, perms_type, sort_no, menu_type, is_leaf, is_route, keep_alive, create_by, del_flag, hidden, create_time, status, always_show, internal_or_external) VALUES ('8989f8bc927fe66001927fe660fb0000', '1700076061557874690', '查看征求意见', 'View for comments', 'enterpriseStandard:adviceList', '1', 3.0, 2, true, true, false, 'chh', 0, false, '2024-10-12 16:44:17', '1', false, false); + +-- 修改修订类型字典 +UPDATE `laws_chery_dev`.`sys_dict` SET `dict_name` = '企标计划-制修订类型', `dict_en_name` = NULL, `dict_code` = 'esp_revision_type', `description` = '', `del_flag` = 0, `create_by` = 'ldq', `create_time` = '2024-09-05 09:32:49', `update_by` = NULL, `update_time` = NULL, `type` = NULL, `is_tag_dict` = 1, `is_read_only` = 0, `attribute_type` = '1', `order_num` = 35 WHERE `id` = '1831505732815413250'; + +-- 企标新增制修订类型字段 +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 ('1845652446329446401', 'laws_enterprise_standard', 'zhi4_xiu1_ding4_lei4_xing2', 'Revision Type', '制修订类型', 29, 'zhi4_xiu1_ding4_lei4_xing2', 0, 1, 'String', 100, NULL, NULL, 'esp_revision_type', NULL, NULL, '10', NULL, NULL, NULL, '0', NULL, NULL, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, '2024-10-14 10:26:48', 'chh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '1694631025451048961', NULL, 0, 0, '3', '1831505732815413250', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java index 215a9424..5647876c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java @@ -232,6 +232,11 @@ public class LawsEnterpriseStandard implements Serializable { private String specializedModule; + @Dict(dicCode = "esp_revision_type") + @ApiModelProperty(value = "制修订类型") + private String revisionType; + + @TableField(exist = false) private static final long serialVersionUID = 1809789807789012221L; }