Merge branch 'master' into 'fix_bug_first_stage'
# Conflicts: # jero-web/src/common/lang/en-us.js
This commit is contained in:
肖文钰
@@ -238,3 +238,150 @@ CREATE TABLE `laws_technology_evaluation` (
|
||||
`prc_num` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC;
|
||||
|
||||
-- 上报库认证类别参数信息 添加字段 2022-07-11
|
||||
ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
|
||||
ADD COLUMN `params_manifest_id` varchar(50) NULL COMMENT '上报库id' AFTER `version`;
|
||||
|
||||
-- 法规技术评估-流程明细表
|
||||
CREATE TABLE `laws_technology_evaluation_flow_detail` (
|
||||
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
|
||||
`laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
|
||||
`acti_proc_inst_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
|
||||
`prc_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
|
||||
`prc_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程名称',
|
||||
`evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-流程明细表' ROW_FORMAT = Dynamic;
|
||||
|
||||
-- 工作流数据库增加数据。
|
||||
INSERT INTO `t_form` (
|
||||
`OBJECT_ID`,`CODE`,`CREATE_TIME`,`WIDGET_JSON`,`JSON`,`NAME`,`SHOW_KEY`,`IS_DELETED`,
|
||||
`MODEL_ID`,`JSON_EVAL`,`HTML`,`RUN_TYPE`,`CATEGORY_ID`,`HTML_READONLY`
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
'fgjspglc','0006','2022-07-11 15:45:33',NULL,NULL,'法规技术评估流程',NULL,
|
||||
0,'15007',NULL,NULL,'json','4bdf0b396b4aa6ea10dd5e19956a1e22',NULL
|
||||
);
|
||||
|
||||
-- 法规技术评估-条款信息评估结果表
|
||||
CREATE TABLE `laws_technology_evaluation_item_result` (
|
||||
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
|
||||
`item_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款id',
|
||||
`item_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款号',
|
||||
`item_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款名称',
|
||||
`item_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款内容',
|
||||
`evaluation_methods` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估方式',
|
||||
`technical_file_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称',
|
||||
`section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节',
|
||||
`opinion` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '意见',
|
||||
`accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件',
|
||||
`compliance_result` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果',
|
||||
`evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id',
|
||||
`acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
|
||||
`sponsor_feedback` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发起人反馈',
|
||||
`laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-条款信息评估结果表' ROW_FORMAT = Dynamic;
|
||||
|
||||
-- 法规技术评估-评估人反馈-符合性结果表
|
||||
CREATE TABLE `laws_technology_evaluation_compliance_result` (
|
||||
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
|
||||
`laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
|
||||
`compliance_result` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果',
|
||||
`acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估人反馈-符合性结果表' ROW_FORMAT = Dynamic;
|
||||
|
||||
-- 法规技术评估-评估结果表
|
||||
CREATE TABLE `laws_technology_evaluation_result` (
|
||||
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
|
||||
`laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
|
||||
`related_section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节',
|
||||
`issue_or_suggest` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议',
|
||||
`reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由',
|
||||
`accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件',
|
||||
`submit_time` datetime NULL DEFAULT NULL COMMENT '提出时间',
|
||||
`acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估结果表' ROW_FORMAT = Dynamic;
|
||||
|
||||
|
||||
-- 增加评估方式树形字典。
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745025973256194', '0', '评1', NULL, 'admin', '2022-07-12 14:35:26', 'admin', '2022-07-12 14:36:36', 'A01', '1546744902203539458', '1', 'P1', '333', 1, NULL, NULL, 0, NULL, 1);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745149692641282', '0', '评2', NULL, 'admin', '2022-07-12 14:35:55', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P2', NULL, 1, NULL, NULL, 0, NULL, 2);
|
||||
INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745318161055745', '1546745025973256194', '评1+1', NULL, 'admin', '2022-07-12 14:36:36', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P1+1', NULL, 1, NULL, NULL, 0, NULL, 1);
|
||||
|
||||
INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1546744902203539458', '评估方式', 'evaluation_method', '评估方式', 0, 'admin', '2022-07-12 14:34:56', NULL, NULL, NULL, NULL, 1, 0, '2', 1);
|
||||
|
||||
-- 参数项清单 修改字段长度 2022-07-12
|
||||
ALTER TABLE `laws_weilai`.`params_info`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`cert_category_params_info`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_info_publish`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`cert_category_params_info_publish`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_collect_manifest`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_batch`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_report_detail`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
|
||||
--以上SQL 2022年7月12日 已同步正式环境
|
||||
|
||||
-- 参数项清单表 添加字段 标题默认值 2022-07-13 已同步正式环境
|
||||
ALTER TABLE `laws_weilai`.`params_info`
|
||||
ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_template_id`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_info_publish`
|
||||
ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `version`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_collect_manifest`
|
||||
ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `add_flag`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
|
||||
ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_manifest_id`;
|
||||
|
||||
ALTER TABLE `laws_weilai`.`params_report_detail`
|
||||
ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `sync_time`;
|
||||
|
||||
-- 法规技术评估 反馈评估表中，增加符合性结果表id关联 2022-07-14 已同步正式环境
|
||||
ALTER TABLE `laws_technology_evaluation_result`
|
||||
ADD COLUMN `compliance_result_id` varchar(64) NULL COMMENT '符合性结果id' AFTER `acti_proc_inst_id`;
|
||||
|
||||
-- 用户表 删除索引 2022-07-14 已同步
|
||||
ALTER TABLE `laws_weilai`.`sys_user`
|
||||
DROP INDEX `uniq_sys_user_phone`,
|
||||
DROP INDEX `uniq_sys_user_email`;
|
||||
Reference in New Issue
Block a user