ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 拆分页面增加标准拆分状态字段

Browse Source
This commit is contained in:
mzaxd
2024-07-03 13:41:06 +08:00
parent 8b17638637
commit 8f2c1b5506
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/prod/2024-3-18-变更.sql
+17 -1
View File
@@ -146,4 +146,20 @@ ALTER TABLE `laws_news_feed`
MODIFY COLUMN `dynamic_heading` varchar(500) NULL DEFAULT NULL COMMENT '动态标题' AFTER `del_flag`;
-- 2024-05-24 增加E采通默认账户
INSERT INTO `sys_user` (`id`, `username`, `realname`, `password`, `salt`, `avatar`, `birthday`, `sex`, `email`, `phone`, `org_code`, `status`, `del_flag`, `third_id`, `third_type`, `activiti_sync`, `telephone`, `create_by`, `create_time`, `update_by`, `update_time`, `user_identity`, `depart_ids`, `rel_tenant_ids`, `client_id`, `type_id`, `post`, `duty_level_id`, `direct_leadership`, `post_status`) VALUES ('1697512444622827522', 'etton', 'E采通', '69d156abcf58db06', 'vnrp4hS1', NULL, NULL, NULL, NULL, NULL, 'A01', 1, 0, NULL, NULL, NULL, NULL, 'admin', '2023-09-01 15:31:20', 'ldq', '2023-09-28 16:07:28', 1, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `sys_user` (`id`, `username`, `realname`, `password`, `salt`, `avatar`, `birthday`, `sex`, `email`, `phone`, `org_code`, `status`, `del_flag`, `third_id`, `third_type`, `activiti_sync`, `telephone`, `create_by`, `create_time`, `update_by`, `update_time`, `user_identity`, `depart_ids`, `rel_tenant_ids`, `client_id`, `type_id`, `post`, `duty_level_id`, `direct_leadership`, `post_status`) VALUES ('1697512444622827522', 'etton', 'E采通', '69d156abcf58db06', 'vnrp4hS1', NULL, NULL, NULL, NULL, NULL, 'A01', 1, 0, NULL, NULL, NULL, NULL, 'admin', '2023-09-01 15:31:20', 'ldq', '2023-09-28 16:07:28', 1, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-- 2024-07-03 增加标准拆分状态字段 1-未拆分 2-已拆分 3-拆分中
ALTER TABLE `laws_enterprise_standard`
ADD COLUMN `standard_split_status` varchar(1) NULL DEFAULT '2' COMMENT '标准拆分状态（字典：1：已拆分 2：未拆分 3：已更改未拆分）';
ALTER TABLE `laws_domestic_standard`
ADD COLUMN `standard_split_status` varchar(1) NULL DEFAULT '2' COMMENT '标准拆分状态（字典：1：已拆分 2：未拆分 3：已更改未拆分）';
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`) VALUES ('1808343085748060161', 'laws_domestic_standard', 'standard_split_status', 'Standard Split Status', '标准拆分状态', 50, 'standard_split_status', 0, 1, 'String', 100, NULL, NULL, 'standard_split_status', NULL, NULL, '10', NULL, NULL, NULL, '0', NULL, NULL, 1, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, '2024-07-03 11:32:44', 'admin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '1499657602378825729', NULL, 0, 0, '1', '1808342548990394370', NULL, NULL, NULL, NULL, NULL, NULL);
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`) VALUES ('1808343780333191170', 'laws_enterprise_standard', 'standard_split_status', 'Standard Split Status', '标准拆分状态', 50, 'standard_split_status', 0, 1, 'String', 100, NULL, NULL, 'standard_split_status', NULL, NULL, '10', NULL, NULL, NULL, '0', NULL, NULL, 1, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, '2024-07-03 11:35:29', 'admin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '1694631025451048961', NULL, 0, 0, '3', '1808342548990394370', NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_en_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1807961317556539393', '标准拆分状态', NULL, 'standard_split_status', '', 0, 'admin', '2024-07-02 10:15:43', 'ldq1', '2024-07-03 11:46:36', NULL, 1, 0, '1', 1);
INSERT INTO `sys_dict_item` (`id`, `dict_id`, `parent_id`, `item_text`, `en_name`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `stat_node`) VALUES ('1807961647790870529', '1807961317556539393', '0', '已拆分', 'Split', '1', '', 1, 1, 'admin', '2024-07-02 10:17:02', 'admin', '2024-07-02 10:17:40', 0, 0, NULL, '0', NULL);
INSERT INTO `sys_dict_item` (`id`, `dict_id`, `parent_id`, `item_text`, `en_name`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `stat_node`) VALUES ('1807961785812832257', '1807961317556539393', '0', '未拆分', 'Unsplit', '2', '', 1, 1, 'admin', '2024-07-02 10:17:35', NULL, NULL, 0, 0, NULL, '0', NULL);
INSERT INTO `sys_dict_item` (`id`, `dict_id`, `parent_id`, `item_text`, `en_name`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `stat_node`) VALUES ('1807961969523347457', '1807961317556539393', '0', '已更改未拆分', 'modify Unsplit', '3', '', 1, 1, 'admin', '2024-07-02 10:18:18', 'admin', '2024-07-03 11:52:41', 1, 0, NULL, '0', NULL);
laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java
+4
View File
@@ -85,4 +85,8 @@ public class SplitFileInfo {
@TableField(exist = false)
private Integer pageSize;
@TableField(exist = false)
@Dict(dicCode = "standard_split_status")
private String standardSplitStatus;
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+2 -2
View File
@@ -217,11 +217,11 @@
<select id="querySplitFileInfoByPage" resultType="com.jero.modules.laws.documenttool.entity.SplitFileInfo">
select standard.*, o.id id, o.file_name, o.standard_file_type, o.url
from (select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 1 origin, create_time, create_by, update_by, update_time, null as esMainDraftUnit
from (select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 1 origin, create_time, create_by, update_by, update_time, null as esMainDraftUnit, standard_split_status
from laws_domestic_standard
where del_flag = 0
union all
select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 3 origin, create_time, create_by, update_by, update_time, main_drafting_unit as esMainDraftUnit
select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 3 origin, create_time, create_by, update_by, update_time, main_drafting_unit as esMainDraftUnit, standard_split_status
from laws_enterprise_standard
where del_flag = 0) standard left join oss_file o on standardId = o.standard_id
${ew.customSqlSegment}