合并分支 'dev_third_stage' 到 'master'
Dev third stage 查看合并请求 laws-nio/laws-weilai!50
This commit is contained in:
李雪涛
@@ -117,4 +117,90 @@ CREATE TABLE `params_collect_manifest_user_type_log` (
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- 以上部分2022年7月2日已更新至正式环境
|
||||
-- 以上部分2022年7月2日已更新至正式环境
|
||||
|
||||
-- 认证模块菜单权限
|
||||
SET FOREIGN_KEY_CHECKS = 0;
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541614812204711937', '1536593381830782978', '添加清单', NULL, NULL, NULL, NULL, 2, 'params:manifest:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:49:48', NULL, NULL, 0, 0, '1', 0, 'Add Manifest');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541615032762187777', '1536593381830782978', '变更扩展', NULL, NULL, NULL, NULL, 2, 'params:manifest:change', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:50:40', NULL, NULL, 0, 0, '1', 0, 'Change Extension');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541615202417590273', '1536593381830782978', '复制参数清单', NULL, NULL, NULL, NULL, 2, 'params:manifest:copy', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:51:21', NULL, NULL, 0, 0, '1', 0, 'Copy');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541615399201751041', '1536593381830782978', '批量删除', NULL, NULL, NULL, NULL, 2, 'params:manifest:deleteBatch', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:52:08', NULL, NULL, 0, 0, '1', 0, 'Batch Delete');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541615599395880962', '1536593381830782978', '配置', NULL, NULL, NULL, NULL, 2, 'params:config:list', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2022-06-28 10:52:55', NULL, NULL, 0, 0, '1', 0, 'Config');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541615902719557634', '1541615599395880962', '添加配置', NULL, NULL, NULL, NULL, 2, 'params:config:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:54:08', 'admin', '2022-07-02 10:22:28', 0, 0, '1', 0, 'Add Config');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541616014690697217', '1541615599395880962', '删除配置', NULL, NULL, NULL, NULL, 2, 'params:config:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:54:34', 'admin', '2022-07-02 10:22:51', 0, 0, '1', 0, 'Delete Config');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541616135687979009', '1541615599395880962', '提交', NULL, NULL, NULL, NULL, 2, 'params:config:addBatch', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:55:03', NULL, NULL, 0, 0, '1', 0, 'Submit');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541616271113666562', '1536593381830782978', '编辑', NULL, NULL, NULL, NULL, 2, 'params:manifest:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:55:36', NULL, NULL, 0, 0, '1', 0, 'Edit');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541616380576612353', '1536593381830782978', '删除', NULL, NULL, NULL, NULL, 2, 'params:manifest:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:56:02', NULL, NULL, 0, 0, '1', 0, 'Delete');
|
||||
|
||||
INSERT INTO `laws_weilai`.`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`) VALUES ('1541616583316684802', '1536593381830782978', '历史版本', NULL, NULL, NULL, NULL, 2, 'params:manifest:history', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:56:50', NULL, NULL, 0, 0, '1', 0, 'History Version');
|
||||
|
||||
UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '参数模板管理', `url` = '/ParameterTemplate', `component` = 'parameter/ParameterTemplate/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'params:template:page', `perms_type` = '1', `sort_no` = 1.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-04-21 10:27:11', `update_by` = 'admin', `update_time` = '2022-06-22 09:51:26', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Parameter Template' WHERE `id` = '1516966747216728066';
|
||||
|
||||
UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1514541055125291010', `name` = '认证参数列表', `url` = NULL, `component` = NULL, `component_name` = NULL, `redirect` = NULL, `menu_type` = 2, `perms` = 'params:manifest:page', `perms_type` = '1', `sort_no` = 1.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'shanshan.su', `create_time` = '2022-06-14 14:16:25', `update_by` = 'admin', `update_time` = '2022-07-02 10:32:31', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Task parameter collection' WHERE `id` = '1536593381830782978';
|
||||
|
||||
SET FOREIGN_KEY_CHECKS = 1;
|
||||
-- 以上部分2022年7月6日已更新至正式环境
|
||||
|
||||
-- 参数项收集清单字段信息修改
|
||||
SET FOREIGN_KEY_CHECKS = 0;
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'description', `db_field_en_name` = 'Description', `db_field_txt` = '参数说明', `order_num` = 13, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 200, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '2a6b10cce459f27170695bab1265c94a';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'sdt', `db_field_en_name` = 'Sdt', `db_field_txt` = '工程接口人', `order_num` = 21, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'deadline', `db_field_en_name` = 'Deadline', `db_field_txt` = '截止时间', `order_num` = 23, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'Date', `db_length` = 0, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'date', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '7b8ece563b5403adfb3ea0378c896dcd';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'cert_category', `db_field_en_name` = 'Cert Category', `db_field_txt` = '认证类别', `order_num` = 9, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 1000, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'state', `db_field_en_name` = 'State', `db_field_txt` = '状态', `order_num` = 19, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '9050dc65a7b2fe82927b74a9ef4a4bb4';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'dre', `db_field_en_name` = 'Dre', `db_field_txt` = '填写人', `order_num` = 22, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'params_name', `db_field_en_name` = 'Params Name', `db_field_txt` = '参数名称', `order_num` = 10, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 30, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'e586bd87d4d826ce3d7d373caf54c6f6';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'duty_territory', `db_field_en_name` = 'Duty territory', `db_field_txt` = '责任领域', `order_num` = 20, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'ed57f77975218560b37ea497a20109c6';
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'nio_number', `db_field_en_name` = 'NIO Number', `db_field_txt` = 'NIO编号', `order_num` = 7, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 15, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'fadb1e8609593c3a5ea3cda4f0f97464';
|
||||
|
||||
SET FOREIGN_KEY_CHECKS = 1;
|
||||
|
||||
-- 上报库配置表添加字段
|
||||
ALTER TABLE `laws_weilai`.`params_report_config`
|
||||
ADD COLUMN `old_params_config_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集库参数配置id' AFTER `display_seq`;
|
||||
|
||||
|
||||
-- 法规意见收集添加字段 文档库/标准id
|
||||
ALTER TABLE `laws_opinion_gather`
|
||||
ADD COLUMN `stand_id` varchar(64) NULL COMMENT '文档库/标准id' AFTER `acti_proc_inst_id`;
|
||||
-- 法规意见收集添加字段 流程编号
|
||||
ALTER TABLE `laws_opinion_gather`
|
||||
ADD COLUMN `prc_num` varchar(64) NULL COMMENT '流程编号' AFTER `stand_id`;
|
||||
|
||||
-- 上报库导出历史表
|
||||
CREATE TABLE `params_report_export_history` (
|
||||
`id` varchar(36) NOT NULL,
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
|
||||
`params_manifest_id` varchar(50) DEFAULT NULL COMMENT '上报库id',
|
||||
`export_type` varchar(50) DEFAULT NULL COMMENT '导出类型',
|
||||
`export_time` datetime DEFAULT NULL COMMENT '导出时间',
|
||||
`export_file_id` varchar(50) DEFAULT NULL COMMENT '导出文件id',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- 参数清单历史版本 添加字段
|
||||
ALTER TABLE `laws_weilai`.`params_manifest_history`
|
||||
ADD COLUMN `source_params_manifest_id` varchar(50) NULL COMMENT '源参数清单id' AFTER `params_template_publish_version`;
|
||||
+3
-5
@@ -15,8 +15,6 @@ import com.jero.modules.cert.collect.service.IParamsConfigEOService;
|
||||
import com.jero.modules.cert.collect.service.IParamsManifestEOService;
|
||||
import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
|
||||
import com.jero.modules.cert.collect.vo.ParamsManifestVO;
|
||||
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
|
||||
import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
|
||||
import com.jero.modules.cert.template.entity.ParamsTemplateEO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -244,15 +242,15 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
|
||||
/**
|
||||
* 历史版本
|
||||
* 根据标题查询
|
||||
* @param title
|
||||
* @param paramsManifestId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "参数清单-历史版本")
|
||||
@ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
|
||||
@GetMapping(value = "/history")
|
||||
@RequiresPermissions("params:manifest:history")
|
||||
public Result<?> history(@RequestParam(name="title",required=true) String title) {
|
||||
List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(title);
|
||||
public Result<?> history(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId) {
|
||||
List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(paramsManifestId);
|
||||
return Result.OK(historyVersionList);
|
||||
}
|
||||
|
||||
|
||||
+6
@@ -2,9 +2,11 @@ package com.jero.modules.cert.collect.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -23,4 +25,8 @@ import java.io.Serializable;
|
||||
public class ParamsManifestHistoryEO extends ParamsManifestEO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**版本*/
|
||||
@Excel(name = "源参数清单id", width = 15)
|
||||
@ApiModelProperty(value = "源参数清单id")
|
||||
private String sourceParamsManifestId;
|
||||
}
|
||||
|
||||
+1
@@ -15,5 +15,6 @@
|
||||
<result column="version" property="version" />
|
||||
<result column="project_id" property="projectId" />
|
||||
<result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
|
||||
<result column="source_params_manifest_id" property="sourceParamsManifestId" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+1
-1
@@ -74,7 +74,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
|
||||
|
||||
boolean changeExtension(String id, String cut);
|
||||
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String title);
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
|
||||
|
||||
IPage getAllManifest(IPage page, String projectName);
|
||||
|
||||
|
||||
+1
-1
@@ -16,5 +16,5 @@ public interface IParamsManifestHistoryEOService extends IService<ParamsManifest
|
||||
|
||||
void addForChangeExtension(String paramsManifestId);
|
||||
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String title);
|
||||
List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
|
||||
}
|
||||
|
||||
+5
@@ -598,6 +598,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
controlValue = controlValue.replace("，", ",");
|
||||
String[] controlValueStr = controlValue.split(",");
|
||||
for (int i = 0; i < controlValueStr.length; i++) {
|
||||
if (StringUtils.isBlank(controlValueStr[i])) { // 选项中的空字符串，不作为备选值
|
||||
continue;
|
||||
}
|
||||
Map<String, String> controlValueMap = new HashMap<>();
|
||||
controlValueMap.put("label", controlValueStr[i]);
|
||||
controlValueMap.put("value", controlValueStr[i]);
|
||||
@@ -1240,6 +1243,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
feishuMsgVo.setTitle(MessageTypeEnum.HOMO_TASK.getName());
|
||||
feishuMsgVo.setContent(content);
|
||||
feishuMsgVo.setUrl(hrefFeishu);
|
||||
feishuMsgVo.setTaskType(MessageTypeEnum.HOMO_TASK.getName());
|
||||
feishuService.sendCardMsg(thirdIds, feishuMsgVo);
|
||||
} catch (IOException e) {
|
||||
log.error("飞书消息推送失败");
|
||||
@@ -1312,6 +1316,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
feishuMsgVo.setTitle(MessageTypeEnum.HOMO_TASK.getName());
|
||||
feishuMsgVo.setContent(content);
|
||||
feishuMsgVo.setUrl(hrefFeishu);
|
||||
feishuMsgVo.setTaskType(MessageTypeEnum.HOMO_TASK.getName());
|
||||
feishuService.sendCardMsg(thirdIds, feishuMsgVo);
|
||||
} catch (IOException e) {
|
||||
log.error("飞书消息推送失败");
|
||||
|
||||
+2
-4
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
|
||||
@@ -23,7 +22,6 @@ import com.jero.modules.cert.collect.service.*;
|
||||
import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
|
||||
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
|
||||
import com.jero.modules.cert.template.entity.ParamsTemplateEO;
|
||||
import com.jero.modules.cert.template.enums.ControlTypeEnum;
|
||||
import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
|
||||
import com.jero.modules.cert.template.service.IParamsTemplateEOService;
|
||||
import com.jero.modules.project.entity.ProjectRelatedPersonnel;
|
||||
@@ -438,8 +436,8 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String title) {
|
||||
return paramsManifestHistoryEOService.getHistoryVersionList(title);
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
|
||||
return paramsManifestHistoryEOService.getHistoryVersionList(paramsManifestId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
+3
-2
@@ -64,6 +64,7 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
|
||||
BeanUtils.copyProperties(paramsManifestEO, paramsManifestHistoryEO);
|
||||
String paramsManifestHistoryId = UUID.randomUUID().toString().replace("-","");
|
||||
paramsManifestHistoryEO.setId(paramsManifestHistoryId);
|
||||
paramsManifestHistoryEO.setSourceParamsManifestId(paramsManifestId); // 绑定 源清单
|
||||
|
||||
// 查询清单下配置
|
||||
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
|
||||
@@ -131,10 +132,10 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String title) {
|
||||
public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
|
||||
// 同一项目下标题时唯一的，历史版本和当前版本通过标题进行关联
|
||||
LambdaQueryWrapper<ParamsManifestHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ParamsManifestHistoryEO::getTitle, title)
|
||||
queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId)
|
||||
.orderByAsc(ParamsManifestHistoryEO::getVersion);
|
||||
List<ParamsManifestHistoryEO> list = list(queryWrapper);
|
||||
List<ParamsManifestHistoryVO> historyVersionList = new ArrayList<>();
|
||||
|
||||
+31
-1
@@ -96,7 +96,7 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
|
||||
}
|
||||
|
||||
/**
|
||||
* 冻结配置-下拉选项
|
||||
* 配置下拉选项(常规导出)
|
||||
*
|
||||
* @param paramsReportDetailVO
|
||||
* @return
|
||||
@@ -110,4 +110,34 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
|
||||
return Result.OK(configLabelList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置下拉选项(自定义导出)
|
||||
*
|
||||
* @param paramsReportDetailVO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "上报库参数项-配置下拉选项(自定义导出)")
|
||||
@ApiOperation(value="上报库参数项-配置下拉选项(自定义导出)", notes="上报库参数项-配置下拉选项(自定义导出)")
|
||||
@GetMapping(value = "/getConfigLabelListCustom")
|
||||
// @RequiresPermissions("report:detail:export:custom")
|
||||
public Result<?> getConfigLableListCustom(ParamsReportDetailVO paramsReportDetailVO) {
|
||||
List<Map<String, String>> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO);
|
||||
return Result.OK(configLabelList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出模板下拉选项
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "上报库参数项-导出模板下拉选项")
|
||||
@ApiOperation(value="上报库参数项-导出模板下拉选项", notes="上报库参数项-导出模板下拉选项")
|
||||
@GetMapping(value = "/getTemplateLabelList")
|
||||
// @RequiresPermissions("report:detail:export:custom")
|
||||
public Result<?> getTemplateLabelList() {
|
||||
List<Map<String, String>> templateLabelList = paramsReportDetailEOService.getTemplateLabelList();
|
||||
return Result.OK(templateLabelList);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+3
@@ -40,4 +40,7 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
|
||||
|
||||
// 配置-下拉选项
|
||||
List<Map<String, String>> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO);
|
||||
|
||||
// 导出模板下拉选项
|
||||
List<Map<String, String>> getTemplateLabelList();
|
||||
}
|
||||
|
||||
+25
-8
@@ -18,16 +18,10 @@ import com.jero.modules.cert.collect.entity.*;
|
||||
import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
|
||||
import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
|
||||
import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
|
||||
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
|
||||
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
|
||||
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
|
||||
import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
|
||||
import com.jero.modules.cert.report.entity.*;
|
||||
import com.jero.modules.cert.report.enums.ExportTypeEnum;
|
||||
import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper;
|
||||
import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
|
||||
import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
|
||||
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
|
||||
import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
|
||||
import com.jero.modules.cert.report.service.*;
|
||||
import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
|
||||
import com.jero.modules.cert.template.enums.ControlTypeEnum;
|
||||
import com.jero.modules.document.enums.FieldTypeEnum;
|
||||
@@ -647,6 +641,29 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
||||
return configLabelList;
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private IParamsExportTemplateEOService paramsExportTemplateEOService;
|
||||
|
||||
@Override
|
||||
public List<Map<String, String>> getTemplateLabelList() {
|
||||
// 查询所有导出模板
|
||||
LambdaQueryWrapper<ParamsExportTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime);
|
||||
List<ParamsExportTemplateEO> paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper);
|
||||
|
||||
List<Map<String, String>> templateLabelList = new ArrayList<>();
|
||||
if (CollectionUtil.isNotEmpty(paramsExportTemplateEOList)) {
|
||||
for (ParamsExportTemplateEO paramsExportTemplateEO : paramsExportTemplateEOList) {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("label", paramsExportTemplateEO.getTemplateName());
|
||||
map.put("value", paramsExportTemplateEO.getId());
|
||||
templateLabelList.add(map);
|
||||
}
|
||||
}
|
||||
|
||||
return templateLabelList;
|
||||
}
|
||||
|
||||
private void downLoadFileList(List<OSSFile> allRelevFileList,String fileNowPath) {
|
||||
File nowFile = new File(fileNowPath);
|
||||
if (nowFile.exists()){
|
||||
|
||||
+7
-4
@@ -1,9 +1,12 @@
|
||||
package com.jero.modules.lawsOpinionGather.controller;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
|
||||
@@ -66,8 +69,8 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
|
||||
@AutoLog(value = "法规意见收集-评估结果表-列表查询")
|
||||
@ApiOperation(value="法规意见收集-评估结果表-列表查询", notes="法规意见收集-评估结果表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<LawsOpinionAssessmentResultEO>> queryList() {
|
||||
List<LawsOpinionAssessmentResultEO> list = lawsOpinionAssessmentResultEOService.queryList();
|
||||
public Result<List<LawsOpinionAssessmentResultEO>> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO,HttpServletRequest req,String cut) {
|
||||
List<LawsOpinionAssessmentResultEO> list = lawsOpinionAssessmentResultEOService.queryList(lawsOpinionAssessmentResultEO,req,cut);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
@@ -170,8 +173,8 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
|
||||
@AutoLog(value = "法规意见收集-评估结果表-添加")
|
||||
@ApiOperation(value="法规意见收集-评估结果表-添加", notes="法规意见收集-评估结果表-添加")
|
||||
@PostMapping(value = "/insertBatch")
|
||||
public Result<?> insertBatch(@Validated @RequestBody List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
|
||||
this.lawsOpinionAssessmentResultEOService.insertBatch(lawsOpinionAssessmentResultEOList);
|
||||
public Result<?> insertBatch(@RequestBody JSONObject json) {
|
||||
this.lawsOpinionAssessmentResultEOService.insertBatch(json);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
}
|
||||
|
||||
+11
@@ -73,6 +73,9 @@ public class LawsOpinionGatherEO implements Serializable {
|
||||
@Excel(name = "技术领域", width = 15)
|
||||
@ApiModelProperty(value = "技术领域")
|
||||
private String technologyTerritory;
|
||||
@TableField(exist = false)
|
||||
/**技术领域展示字段*/
|
||||
private String technologyTerritoryShow;
|
||||
|
||||
/**收集结果*/
|
||||
@Excel(name = "收集结果", width = 15)
|
||||
@@ -100,4 +103,12 @@ public class LawsOpinionGatherEO implements Serializable {
|
||||
@ApiModelProperty(value = "流程实例id")
|
||||
private String actiProcInstId;
|
||||
|
||||
@Excel(name = "文档库/标准id", width = 15)
|
||||
@ApiModelProperty(value = "文档库/标准id")
|
||||
private String standId;
|
||||
|
||||
@Excel(name = "流程编号", width = 15)
|
||||
@ApiModelProperty(value = "流程编号")
|
||||
private String prcNum;
|
||||
|
||||
}
|
||||
|
||||
+6
-3
@@ -1,7 +1,10 @@
|
||||
package com.jero.modules.lawsOpinionGather.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -57,11 +60,11 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<LawsOpinionAssessmentResultEO> queryList();
|
||||
List<LawsOpinionAssessmentResultEO> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, HttpServletRequest req,String cut);
|
||||
|
||||
/**
|
||||
* 批量新增
|
||||
* @param lawsOpinionAssessmentResultEOList
|
||||
* @param json
|
||||
*/
|
||||
void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList);
|
||||
void insertBatch(JSONObject json);
|
||||
}
|
||||
|
||||
+21
-3
@@ -1,6 +1,9 @@
|
||||
package com.jero.modules.lawsOpinionGather.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
|
||||
import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper;
|
||||
@@ -8,10 +11,14 @@ import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEO
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description: 法规意见收集-评估结果表
|
||||
* @Author: jero-boot
|
||||
@@ -87,12 +94,23 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<LawsOpinionAssessmentResultEO> queryList() {
|
||||
return list();
|
||||
public List<LawsOpinionAssessmentResultEO> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, HttpServletRequest req,String cut) {
|
||||
QueryWrapper<LawsOpinionAssessmentResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, req.getParameterMap());
|
||||
List<LawsOpinionAssessmentResultEO> list = this.list(queryWrapper);
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
|
||||
public void insertBatch(JSONObject json) {
|
||||
List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList = new ArrayList<>();
|
||||
JSONArray dataList = json.getJSONArray("dataList");
|
||||
LawsOpinionAssessmentResultEO lawsOpinionAssessmentResult = null;
|
||||
|
||||
for (Object data : dataList) {
|
||||
lawsOpinionAssessmentResult = JSONObject.parseObject(JSONObject.toJSONString(data),LawsOpinionAssessmentResultEO.class);
|
||||
lawsOpinionAssessmentResultEOList.add(lawsOpinionAssessmentResult);
|
||||
}
|
||||
|
||||
if (CollectionUtils.isNotEmpty(lawsOpinionAssessmentResultEOList)) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
|
||||
+44
@@ -2,6 +2,7 @@ package com.jero.modules.lawsOpinionGather.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
|
||||
import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
|
||||
@@ -9,11 +10,16 @@ import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper;
|
||||
import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
|
||||
import com.jero.modules.project.enums.OperatorTypeEnum;
|
||||
import com.jero.modules.project.enums.RequestSourceEnum;
|
||||
import com.jero.modules.system.entity.SysCategory;
|
||||
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
@@ -25,6 +31,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
@Service
|
||||
public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGatherEOMapper, LawsOpinionGatherEO> implements ILawsOpinionGatherEOService {
|
||||
|
||||
@Autowired
|
||||
private SysCategoryServiceImpl sysCategoryService;
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
@@ -130,11 +139,46 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
|
||||
@Override
|
||||
public void disposeData(List<LawsOpinionGatherEO> lawsOpinionGatherEOList,String cut) {
|
||||
if(CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)){
|
||||
//树形数据字典
|
||||
List<SysCategory> technologyTerritoryList = sysCategoryService.list();
|
||||
lawsOpinionGatherEOList.forEach(lawsOpinionGather -> {
|
||||
if(StringUtils.isNotEmpty(lawsOpinionGather.getGatherResult())){
|
||||
lawsOpinionGather.setGatherResultShow(GatherResultEnum.getTextByValue(lawsOpinionGather.getGatherResult(),cut));
|
||||
}
|
||||
if(StringUtils.isNotEmpty(lawsOpinionGather.getTechnologyTerritory())){
|
||||
String technologyTerritoryShow = disposeTechnologyTerritory(technologyTerritoryList, lawsOpinionGather.getTechnologyTerritory(), cut);
|
||||
lawsOpinionGather.setTechnologyTerritoryShow(technologyTerritoryShow);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理技术领域展示字段
|
||||
* @param technologyTerritoryList
|
||||
* @param technologyTerritory
|
||||
* @param cut
|
||||
* @return
|
||||
*/
|
||||
public String disposeTechnologyTerritory(List<SysCategory> technologyTerritoryList,String technologyTerritory,String cut){
|
||||
String result = "";
|
||||
// technology_territory
|
||||
if(StringUtils.isNotEmpty(technologyTerritory)){
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (String technologyTerritoryId : technologyTerritory.split(",")) {
|
||||
List<SysCategory> collect = technologyTerritoryList.stream().filter(e -> e.getId().equals(technologyTerritoryId)).collect(Collectors.toList());
|
||||
if(collect.size() != 0){
|
||||
if(CutEnum.CN.getValue().equals(cut)){
|
||||
sb.append(collect.get(0).getName()+",");
|
||||
}else{
|
||||
sb.append(collect.get(0).getEnName()+",");
|
||||
}
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotEmpty(sb)){
|
||||
result = sb.substring(0, sb.length() - 1);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
+29
-1
@@ -13,13 +13,18 @@ import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper;
|
||||
import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService;
|
||||
import com.jero.modules.project.enums.OperatorTypeEnum;
|
||||
import com.jero.modules.project.enums.RequestSourceEnum;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
@@ -33,6 +38,9 @@ import javax.servlet.http.HttpServletRequest;
|
||||
@Service
|
||||
public class LawsProcessHistoryEOServiceImpl extends ServiceImpl<LawsProcessHistoryEOMapper, LawsProcessHistoryEO> implements ILawsProcessHistoryEOService {
|
||||
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
@@ -142,7 +150,27 @@ public class LawsProcessHistoryEOServiceImpl extends ServiceImpl<LawsProcessHist
|
||||
lawsProcessHistoryEO = JSONObject.parseObject(JSONObject.toJSONString(lawsProcessHistory),LawsProcessHistoryEO.class);
|
||||
lawsProcessHistoryEOList.add(lawsProcessHistoryEO);
|
||||
}
|
||||
this.saveBatch(lawsProcessHistoryEOList);
|
||||
if(CollectionUtils.isNotEmpty(lawsProcessHistoryEOList)){
|
||||
List<String> createUserId = lawsProcessHistoryEOList.stream().map(LawsProcessHistoryEO::getCreateBy).distinct().collect(Collectors.toList());
|
||||
if(CollectionUtils.isNotEmpty(createUserId)){
|
||||
QueryWrapper<SysUser> queryUserWrapper = new QueryWrapper<>();
|
||||
queryUserWrapper.lambda().in(SysUser::getId,createUserId);
|
||||
List<SysUser> sysUserList = sysUserService.getBaseMapper().selectList(queryUserWrapper);
|
||||
|
||||
lawsProcessHistoryEOList.forEach(lawsProcessHistory -> {
|
||||
String createBy = sysUserList.stream().filter(e -> {
|
||||
boolean flag = false;
|
||||
if (StringUtils.equals(e.getId(), lawsProcessHistory.getCreateBy())) {
|
||||
flag = true;
|
||||
}
|
||||
return flag;
|
||||
}).map(SysUser::getUsername).distinct().collect(Collectors.toList()).get(0);
|
||||
lawsProcessHistory.setCreateBy(createBy);
|
||||
});
|
||||
}
|
||||
|
||||
this.saveBatch(lawsProcessHistoryEOList);
|
||||
}
|
||||
}
|
||||
|
||||
return new Result<>().success("调用成功！");
|
||||
|
||||
+28
-25
@@ -1,25 +1,30 @@
|
||||
package com.jero.modules.report.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
|
||||
import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
@@ -52,23 +57,21 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEO, req.getParameterMap());
|
||||
// Page<LawsMonthlyReportTitleTemplateEO> page = new Page<LawsMonthlyReportTitleTemplateEO>(pageNo, pageSize);
|
||||
// IPage<LawsMonthlyReportTitleTemplateEO> pageList = lawsMonthlyReportTitleTemplateEOService.page(page, queryWrapper);
|
||||
IPage<LawsMonthlyReportTitleTemplateEO> pageList = lawsMonthlyReportTitleTemplateEOService.getPageInfo(pageNo,pageSize, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
List<LawsMonthlyReportTitleTemplateEO> pageList = lawsMonthlyReportTitleTemplateEOService.getPageInfo(lawsMonthlyReportTitleTemplateEO, req);
|
||||
Page pages = lawsMonthlyReportTitleTemplateEOService.getPages(pageNo, pageSize, pageList);
|
||||
return Result.OK(pages);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
* 章节目录
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "月报标题模板-列表查询")
|
||||
@ApiOperation(value="月报标题模板-列表查询", notes="月报标题模板-列表查询")
|
||||
@AutoLog(value = "章节目录")
|
||||
@ApiOperation(value="章节目录", notes="章节目录")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<LawsMonthlyReportTitleTemplateEO>> queryList() {
|
||||
List<LawsMonthlyReportTitleTemplateEO> list = lawsMonthlyReportTitleTemplateEOService.queryList();
|
||||
public Result<List<LawsMonthlyReportTitleTemplateVO>> queryList(String cut) {
|
||||
List<LawsMonthlyReportTitleTemplateVO> list = lawsMonthlyReportTitleTemplateEOService.queryList(cut);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -81,5 +81,4 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable {
|
||||
|
||||
//排序
|
||||
private int sort;
|
||||
|
||||
}
|
||||
|
||||
+3
-12
@@ -128,25 +128,16 @@ public class LawsMonthlyReportWriteEO implements Serializable {
|
||||
private java.lang.String implementCar;
|
||||
|
||||
/**发布日期*/
|
||||
@Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "发布日期")
|
||||
private java.util.Date issueTime;
|
||||
private java.lang.String issueTime;
|
||||
|
||||
/**新车型实施日期*/
|
||||
@Excel(name = "新车型实施日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "新车型实施日期")
|
||||
private java.util.Date newCarImplementTime;
|
||||
private java.lang.String newCarImplementTime;
|
||||
|
||||
/**在产车实施日期*/
|
||||
@Excel(name = "在产车实施日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "在产车实施日期")
|
||||
private java.util.Date productionCarImplementTime;
|
||||
private java.lang.String productionCarImplementTime;
|
||||
|
||||
/**主要内容中文*/
|
||||
@Excel(name = "主要内容中文", width = 15)
|
||||
|
||||
+1
-4
@@ -82,10 +82,7 @@ public class NewOpinionTemplateEO implements Serializable {
|
||||
private java.lang.String standardNameEn;
|
||||
|
||||
/**征求意见截止日期*/
|
||||
@Excel(name = "征求意见截止日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "征求意见截止日期")
|
||||
private java.util.Date expirationDate;
|
||||
private java.lang.String expirationDate;
|
||||
|
||||
}
|
||||
|
||||
+2
-8
@@ -82,17 +82,11 @@ public class NewStandardTemplateEO implements Serializable {
|
||||
private java.lang.String standardNameEn;
|
||||
|
||||
/**发布日期*/
|
||||
@Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "发布日期")
|
||||
private java.util.Date issueTime;
|
||||
private java.lang.String issueTime;
|
||||
|
||||
/**实施日期*/
|
||||
@Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "实施日期")
|
||||
private java.util.Date implementTime;
|
||||
private java.lang.String implementTime;
|
||||
|
||||
}
|
||||
|
||||
+9
-7
@@ -1,10 +1,11 @@
|
||||
package com.jero.modules.report.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
|
||||
import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -60,16 +61,15 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService<LawsM
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<LawsMonthlyReportTitleTemplateEO> queryList();
|
||||
List<LawsMonthlyReportTitleTemplateVO> queryList(String cut);
|
||||
|
||||
/**
|
||||
* 分页
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param queryWrapper
|
||||
* @param lawsMonthlyReportTitleTemplateEO
|
||||
* @return
|
||||
*/
|
||||
IPage<LawsMonthlyReportTitleTemplateEO> getPageInfo(Integer pageNo,Integer pageSize, QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper);
|
||||
List<LawsMonthlyReportTitleTemplateEO> getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO,
|
||||
HttpServletRequest req);
|
||||
|
||||
/**
|
||||
* 一级菜单
|
||||
@@ -81,4 +81,6 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService<LawsM
|
||||
* @param lawsMonthlyReportTitleTemplateEOS
|
||||
*/
|
||||
void move(List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS);
|
||||
|
||||
Page getPages(Integer currentPage, Integer pageSize, List<LawsMonthlyReportTitleTemplateEO> list);
|
||||
}
|
||||
|
||||
+66
-7
@@ -2,15 +2,18 @@ package com.jero.modules.report.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
|
||||
import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper;
|
||||
import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
|
||||
import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
|
||||
import com.jero.modules.system.util.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
@@ -115,13 +118,62 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<LawsMonthlyReportTitleTemplateEO> queryList() {
|
||||
return list();
|
||||
public List<LawsMonthlyReportTitleTemplateVO> queryList(String cut) {
|
||||
List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list();
|
||||
//数据结构重组
|
||||
List<LawsMonthlyReportTitleTemplateVO> lawsMonthlyReportTitleTemplateVOS = new ArrayList<>();
|
||||
for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) {
|
||||
LawsMonthlyReportTitleTemplateVO lawsMonthlyReportTitleTemplateVO = new LawsMonthlyReportTitleTemplateVO();
|
||||
lawsMonthlyReportTitleTemplateVO.setId(lawsMonthlyReportTitleTemplateEO.getId());
|
||||
lawsMonthlyReportTitleTemplateVO.setKey(lawsMonthlyReportTitleTemplateEO.getId());
|
||||
lawsMonthlyReportTitleTemplateVO.setValue(lawsMonthlyReportTitleTemplateEO.getId());
|
||||
lawsMonthlyReportTitleTemplateVO.setParentId(lawsMonthlyReportTitleTemplateEO.getParentId());
|
||||
lawsMonthlyReportTitleTemplateVO.setSort(lawsMonthlyReportTitleTemplateEO.getSort());
|
||||
if(CutEnum.CN.getValue().equals(cut)){
|
||||
lawsMonthlyReportTitleTemplateVO.setTitle(lawsMonthlyReportTitleTemplateEO.getTitleCn());
|
||||
}else{
|
||||
lawsMonthlyReportTitleTemplateVO.setTitle(lawsMonthlyReportTitleTemplateEO.getTitleEn());
|
||||
}
|
||||
lawsMonthlyReportTitleTemplateVOS.add(lawsMonthlyReportTitleTemplateVO);
|
||||
}
|
||||
|
||||
List<LawsMonthlyReportTitleTemplateVO> parentList = lawsMonthlyReportTitleTemplateVOS.stream()
|
||||
.filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
|
||||
Collections.sort(parentList, new Comparator<LawsMonthlyReportTitleTemplateVO>() {
|
||||
@Override
|
||||
public int compare(LawsMonthlyReportTitleTemplateVO p1, LawsMonthlyReportTitleTemplateVO p2) {
|
||||
return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort()));
|
||||
}
|
||||
});
|
||||
|
||||
for (LawsMonthlyReportTitleTemplateVO lawsMonthlyReportTitleTemplateVO : parentList) {
|
||||
List<LawsMonthlyReportTitleTemplateVO> children = lawsMonthlyReportTitleTemplateVOS.stream()
|
||||
.filter(e -> lawsMonthlyReportTitleTemplateVO.getId().equals(e.getParentId())).collect(Collectors.toList());
|
||||
if(children.size() != 0){
|
||||
Collections.sort(children, new Comparator<LawsMonthlyReportTitleTemplateVO>() {
|
||||
@Override
|
||||
public int compare(LawsMonthlyReportTitleTemplateVO p1, LawsMonthlyReportTitleTemplateVO p2) {
|
||||
return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort()));
|
||||
}
|
||||
});
|
||||
for (LawsMonthlyReportTitleTemplateVO child : children) {
|
||||
if(child.getChildren().size() == 0){
|
||||
child.setChildren(null);
|
||||
}
|
||||
}
|
||||
lawsMonthlyReportTitleTemplateVO.setChildren(children);
|
||||
}
|
||||
else{
|
||||
lawsMonthlyReportTitleTemplateVO.setChildren(null);
|
||||
}
|
||||
}
|
||||
return parentList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<LawsMonthlyReportTitleTemplateEO> getPageInfo( Integer pageNo,Integer pageSize,QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper) {
|
||||
List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list();
|
||||
public List<LawsMonthlyReportTitleTemplateEO> getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) {
|
||||
QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap());
|
||||
List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper);
|
||||
List<LawsMonthlyReportTitleTemplateEO> parentList = lawsMonthlyReportTitleTemplateEOS.stream()
|
||||
.filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
|
||||
Collections.sort(parentList, new Comparator<LawsMonthlyReportTitleTemplateEO>() {
|
||||
@@ -141,11 +193,18 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
|
||||
return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort()));
|
||||
}
|
||||
});
|
||||
for (LawsMonthlyReportTitleTemplateEO child : children) {
|
||||
if(child.getChildren().size() == 0){
|
||||
child.setChildren(null);
|
||||
}
|
||||
}
|
||||
lawsMonthlyReportTitleTemplateEO.setChildren(children);
|
||||
}
|
||||
else{
|
||||
lawsMonthlyReportTitleTemplateEO.setChildren(null);
|
||||
}
|
||||
}
|
||||
Page pages = getPages(pageNo, pageSize, parentList);
|
||||
return pages;
|
||||
return parentList;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+17
-8
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
@@ -235,23 +236,31 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
|
||||
List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list();
|
||||
|
||||
//新征求意见清单模板
|
||||
LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
|
||||
List<NewOpinionTemplateEO> newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper);
|
||||
List<NewOpinionTemplateEO> newOpinionTemplateEOList = new ArrayList<>();
|
||||
if(lawsMonthlyReportIdList.size() != 0){
|
||||
LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
|
||||
newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper);
|
||||
}
|
||||
|
||||
|
||||
//新发布标准清单模板
|
||||
LambdaQueryWrapper<NewStandardTemplateEO> qrapperTemp = new LambdaQueryWrapper<>();
|
||||
qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
|
||||
List<NewStandardTemplateEO> newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp);
|
||||
List<NewStandardTemplateEO> newStandardTemplateEOList = new ArrayList<>();
|
||||
if(lawsMonthlyReportIdList.size() != 0){
|
||||
LambdaQueryWrapper<NewStandardTemplateEO> qrapperTemp = new LambdaQueryWrapper<>();
|
||||
qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
|
||||
newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp);
|
||||
}
|
||||
|
||||
|
||||
for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) {
|
||||
//处理章节目录
|
||||
if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){
|
||||
List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream()
|
||||
.filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList());
|
||||
if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
|
||||
if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
|
||||
lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn());
|
||||
}else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
|
||||
}else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
|
||||
lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn());
|
||||
}
|
||||
}
|
||||
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package com.jero.modules.report.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 月报标题模板
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-06-29
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class LawsMonthlyReportTitleTemplateVO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
private String key;
|
||||
|
||||
private String value;
|
||||
|
||||
@ApiModelProperty(value = "父id")
|
||||
private String parentId;
|
||||
|
||||
@ApiModelProperty(value = "标题")
|
||||
private String title;
|
||||
|
||||
private List<LawsMonthlyReportTitleTemplateVO> children = new ArrayList<>();
|
||||
|
||||
private int sort;
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user