diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 4fa0f81cf..284ba745f 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -511,26 +511,23 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co -- 角色表-增加对外报告管理员角色 2022-7-28 已同步生产环境 INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', 'ExternalReportsManager', '对外报告文件夹列表的管理员', 'admin', '2022-7-28 14:08:23', NULL, NULL, NULL, NULL); --- 菜单管理 添加对外报告文件夹管理按钮权限 2022-07-28 已同步生产环境 -INSERT INTO `sys_permission` VALUES ('1552182885208608770', '1549937961282908162', '对外报告文件夹管理', '', NULL, NULL, NULL, 2, 'externalReports:folder', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-7-27 14:43:33', NULL, NULL, 0, 0, '1', 0, 'External Report Folder Management '); - -- 对外报告文件夹表 2022-7-29 已同步生产环境 DROP TABLE IF EXISTS `ext_repo_folder`; CREATE TABLE `ext_repo_folder` ( - `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 '所属部门', - `folder_name` varchar(255) DEFAULT NULL COMMENT '文件夹名称', - `order_id` int(11) DEFAULT NULL COMMENT '文件夹排序', - `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', - `auth_view_ids_name` varchar(2000) DEFAULT NULL COMMENT '查看权限人员', - `auth_manage_ids_name` varchar(2000) DEFAULT NULL COMMENT '管理权限人员', - `auth_view_ids` varchar(2000) DEFAULT NULL COMMENT '查看权限人员id', - `auth_manage_ids` varchar(2000) DEFAULT NULL COMMENT '管理权限人员id', - PRIMARY KEY (`id`) + `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 '所属部门', + `folder_name` varchar(255) DEFAULT NULL COMMENT '文件夹名称', + `order_id` int(11) DEFAULT NULL COMMENT '文件夹排序', + `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', + `auth_view_ids_name` varchar(2000) DEFAULT NULL COMMENT '查看权限人员', + `auth_manage_ids_name` varchar(2000) DEFAULT NULL COMMENT '管理权限人员', + `auth_view_ids` varchar(2000) DEFAULT NULL COMMENT '查看权限人员id', + `auth_manage_ids` varchar(2000) DEFAULT NULL COMMENT '管理权限人员id', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ext_repo_folder` VALUES ('1552846304994131970', 'admin', '2022-07-01 11:11:11', 'admin', '2022-11-11 11:11:11', 'A01', '文件夹', '1', 'root', '', '', '', ''); @@ -538,17 +535,17 @@ INSERT INTO `ext_repo_folder` VALUES ('1552846304994131970', 'admin', '2022-07-0 -- 对外报告数据表 2022-7-29 已同步生产环境 DROP TABLE IF EXISTS `ext_repo_data`; CREATE TABLE `ext_repo_data` ( - `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 '所属部门', - `file_key` varchar(255) DEFAULT NULL COMMENT '文件标识', - `file_name` varchar(255) DEFAULT NULL COMMENT '文件名称', - `file_description` varchar(255) DEFAULT NULL COMMENT '文件说明', - `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', - PRIMARY KEY (`id`) + `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 '所属部门', + `file_key` varchar(255) DEFAULT NULL COMMENT '文件标识', + `file_name` varchar(255) DEFAULT NULL COMMENT '文件名称', + `file_description` varchar(255) DEFAULT NULL COMMENT '文件说明', + `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- 参数项收集清单 认证类别取消列表显示 2022-08-02 已同步生产环境 @@ -731,100 +728,100 @@ CREATE TABLE `laws_weilai`.`country_card_manage_release_detail` ( -- 文档对比信息表 2022-08-07 已同步生产环境 DROP TABLE IF EXISTS `sar_file_compare_info`; CREATE TABLE `sar_file_compare_info` ( - `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 '所属部门', - `file_id_left` varchar(36) DEFAULT NULL COMMENT '文档1', - `file_key_left` varchar(32) DEFAULT NULL COMMENT '文档key1', - `serial_number_left` varchar(36) DEFAULT NULL COMMENT '编号1', - `title_left` varchar(255) DEFAULT NULL COMMENT '标题1', - `file_type_left` varchar(36) DEFAULT NULL COMMENT '文本状态1', - `file_name_left` varchar(255) DEFAULT NULL COMMENT '文件名称1', - `file_id_right` varchar(36) DEFAULT NULL COMMENT '文档2', - `file_key_right` varchar(32) DEFAULT NULL COMMENT '文档key2', - `serial_number_right` varchar(36) DEFAULT NULL COMMENT '编号2', - `title_right` varchar(255) DEFAULT NULL COMMENT '标题2', - `file_type_right` varchar(36) DEFAULT NULL COMMENT '文本状态2', - `file_name_right` varchar(255) DEFAULT NULL COMMENT '文件名称2', - `release_state` varchar(36) DEFAULT NULL COMMENT '发布状态', - `remark` varchar(1000) DEFAULT NULL COMMENT '备注', - `comments` varchar(1000) DEFAULT NULL COMMENT '评论', - PRIMARY KEY (`id`) + `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 '所属部门', + `file_id_left` varchar(36) DEFAULT NULL COMMENT '文档1', + `file_key_left` varchar(32) DEFAULT NULL COMMENT '文档key1', + `serial_number_left` varchar(36) DEFAULT NULL COMMENT '编号1', + `title_left` varchar(255) DEFAULT NULL COMMENT '标题1', + `file_type_left` varchar(36) DEFAULT NULL COMMENT '文本状态1', + `file_name_left` varchar(255) DEFAULT NULL COMMENT '文件名称1', + `file_id_right` varchar(36) DEFAULT NULL COMMENT '文档2', + `file_key_right` varchar(32) DEFAULT NULL COMMENT '文档key2', + `serial_number_right` varchar(36) DEFAULT NULL COMMENT '编号2', + `title_right` varchar(255) DEFAULT NULL COMMENT '标题2', + `file_type_right` varchar(36) DEFAULT NULL COMMENT '文本状态2', + `file_name_right` varchar(255) DEFAULT NULL COMMENT '文件名称2', + `release_state` varchar(36) DEFAULT NULL COMMENT '发布状态', + `remark` varchar(1000) DEFAULT NULL COMMENT '备注', + `comments` varchar(1000) DEFAULT NULL COMMENT '评论', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- 文档对比信息条目表 2022-08-07 已同步生产环境 DROP TABLE IF EXISTS `sar_file_compare_item`; CREATE TABLE `sar_file_compare_item` ( - `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 '所属部门', - `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id', - `menu_id` varchar(36) DEFAULT NULL COMMENT '目录id', - `items_name` varchar(255) DEFAULT NULL COMMENT '条款名称', - `items_num` varchar(255) DEFAULT NULL COMMENT '条款编号', - `items_text` longtext COMMENT '条款正文', - `items_display_num` int(11) DEFAULT NULL COMMENT '条款展示编号', - `target_stand` int(11) DEFAULT NULL COMMENT '对应相似条目', - `left_or_right` varchar(36) DEFAULT NULL COMMENT '条款位置', - `reviewed` int(11) DEFAULT NULL COMMENT '是否被评论(0或1)', - PRIMARY KEY (`id`) + `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 '所属部门', + `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id', + `menu_id` varchar(36) DEFAULT NULL COMMENT '目录id', + `items_name` varchar(255) DEFAULT NULL COMMENT '条款名称', + `items_num` varchar(255) DEFAULT NULL COMMENT '条款编号', + `items_text` longtext COMMENT '条款正文', + `items_display_num` int(11) DEFAULT NULL COMMENT '条款展示编号', + `target_stand` int(11) DEFAULT NULL COMMENT '对应相似条目', + `left_or_right` varchar(36) DEFAULT NULL COMMENT '条款位置', + `reviewed` int(11) DEFAULT NULL COMMENT '是否被评论(0或1)', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- 文档对比信息条目评论表 2022-08-07 已同步生产环境 DROP TABLE IF EXISTS `sar_file_compare_item_comment`; CREATE TABLE `sar_file_compare_item_comment` ( - `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 '所属部门', - `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id', - `items_id_left` varchar(36) DEFAULT NULL COMMENT '条款id左', - `items_id_right` varchar(36) DEFAULT NULL COMMENT '条款id右', - `comment` longtext COMMENT '评论', - PRIMARY KEY (`id`) + `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 '所属部门', + `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id', + `items_id_left` varchar(36) DEFAULT NULL COMMENT '条款id左', + `items_id_right` varchar(36) DEFAULT NULL COMMENT '条款id右', + `comment` longtext COMMENT '评论', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- 文档对比信息目录表 2022-08-07 已同步生产环境 DROP TABLE IF EXISTS `sar_file_compare_menu`; CREATE TABLE `sar_file_compare_menu` ( - `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 '所属部门', - `menu_id` varchar(36) DEFAULT NULL COMMENT '目录ID', - `info_id` varchar(36) DEFAULT NULL COMMENT '信息ID', - `name` varchar(200) DEFAULT NULL COMMENT '目录名称', - `parent_id` varchar(36) DEFAULT NULL COMMENT '父级目录ID', - `display_seq` int(11) DEFAULT NULL COMMENT '排序序号', - `left_or_right` varchar(32) DEFAULT NULL COMMENT '目录位置', - `item_name` varchar(255) DEFAULT NULL COMMENT '条款名称', - `remarks` varchar(255) DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`id`) + `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 '所属部门', + `menu_id` varchar(36) DEFAULT NULL COMMENT '目录ID', + `info_id` varchar(36) DEFAULT NULL COMMENT '信息ID', + `name` varchar(200) DEFAULT NULL COMMENT '目录名称', + `parent_id` varchar(36) DEFAULT NULL COMMENT '父级目录ID', + `display_seq` int(11) DEFAULT NULL COMMENT '排序序号', + `left_or_right` varchar(32) DEFAULT NULL COMMENT '目录位置', + `item_name` varchar(255) DEFAULT NULL COMMENT '条款名称', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- 文档对比信息结果表 2022-08-07 已同步生产环境 DROP TABLE IF EXISTS `sar_file_compare_res_comment`; CREATE TABLE `sar_file_compare_res_comment` ( - `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 '所属部门', - `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id', - `parent_id` varchar(36) DEFAULT NULL COMMENT '回复评论ID', - `comment` longtext COMMENT '评论', - PRIMARY KEY (`id`) + `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 '所属部门', + `info_id` varchar(36) DEFAULT NULL COMMENT '文档对比信息id', + `parent_id` varchar(36) DEFAULT NULL COMMENT '回复评论ID', + `comment` longtext COMMENT '评论', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- 法规技术评估-条款信息评估结果表 字段增加长度 2022-08-08 @@ -855,18 +852,78 @@ CREATE TABLE `laws_weilai`.`country_national_flag` ( `national_flag_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '国旗url', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '国家与国旗中间表' ROW_FORMAT = Dynamic; --- 初始化数据 2022-08-09 -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('11', NULL, NULL, NULL, NULL, NULL, '澳大利亚', 'Australia', NULL, '澳大利亚.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('12', NULL, NULL, NULL, NULL, NULL, '新西兰', 'New Zealand', NULL, '新西兰.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('13', NULL, NULL, NULL, NULL, NULL, '英国', 'UK', NULL, '英国.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('2', NULL, NULL, NULL, NULL, NULL, '中国', 'China', NULL, '中国.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('3', NULL, NULL, NULL, NULL, NULL, '中国香港', 'Hong Kong China', NULL, '中国香港.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('4', NULL, NULL, NULL, NULL, NULL, '韩国', 'South Korea', NULL, '韩国.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('5', NULL, NULL, NULL, NULL, NULL, '日本', 'Japan', NULL, '日本.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('6', NULL, NULL, NULL, NULL, NULL, '新加坡', 'Singapore', NULL, '新加坡.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '马来西亚.jpg'); +-- 初始化数据 2022-08-10 +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('1', NULL, NULL, NULL, NULL, NULL, '欧盟', 'EU', NULL, '/jero-boot/nationalFlag/EU.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('10', NULL, NULL, NULL, NULL, NULL, '美国', 'US', NULL, '/jero-boot/nationalFlag/US.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('11', NULL, NULL, NULL, NULL, NULL, '澳大利亚', 'Australia', NULL, '/jero-boot/nationalFlag/Australia.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('12', NULL, NULL, NULL, NULL, NULL, '新西兰', 'New Zealand', NULL, '/jero-boot/nationalFlag/NewZealand.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('13', NULL, NULL, NULL, NULL, NULL, '英国', 'UK', NULL, '/jero-boot/nationalFlag/UK.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('2', NULL, NULL, NULL, NULL, NULL, '中国', 'China', NULL, '/jero-boot/nationalFlag/China.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('3', NULL, NULL, NULL, NULL, NULL, '中国香港', 'Hong Kong China', NULL, '/jero-boot/nationalFlag/China.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('4', NULL, NULL, NULL, NULL, NULL, '韩国', 'South Korea', NULL, '/jero-boot/nationalFlag/SouthKorea.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('5', NULL, NULL, NULL, NULL, NULL, '日本', 'Japan', NULL, '/jero-boot/nationalFlag/Japan.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('6', NULL, NULL, NULL, NULL, NULL, '新加坡', 'Singapore', NULL, '/jero-boot/nationalFlag/Singapore.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '/jero-boot/nationalFlag/Malaysia.png'); INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('8', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '海湾地区.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '阿联酋.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('1', NULL, NULL, NULL, NULL, NULL, '欧盟', 'EU', NULL, '欧盟.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('10', NULL, NULL, NULL, NULL, NULL, '美国', 'US', NULL, '美国.jpg'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '/jero-boot/nationalFlag/UAE.png'); +-- 法规意见收集-评估结果表字段长度调整 2022-08-11 +ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result` + MODIFY COLUMN `related_section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节' AFTER `laws_opinion_gather_id`, + MODIFY COLUMN `issue_or_suggest` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议' AFTER `related_section`; +-- 法规技术评估-评估结果表 字段长度调整 2022-08-11 +ALTER TABLE `laws_weilai`.`laws_technology_evaluation_result` + MODIFY COLUMN `issue_or_suggest` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议' AFTER `related_section`, + MODIFY COLUMN `reason` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由' AFTER `issue_or_suggest`; + + +-- 展示区域 英文修改 2022-08-11 +UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Relevant Information' WHERE `id` = '1492408622838222850'; +UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'General Information' WHERE `id` = '1499657602378825729'; +UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Document Files' WHERE `id` = '1499658880093847553'; + +-- 数据字典 英文修改 2022-08-11 +-- 同步情况 sync_state +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'No' WHERE `id` = '1507311752583352322'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Yes' WHERE `id` = '1507311835571851265'; +-- 转换结果 result_content +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'In progress' WHERE `id` = '1496785163561398273'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Success' WHERE `id` = '1496785251536924674'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Fail' WHERE `id` = '1496785330251427841'; +-- 机构类型 org_category +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174511244036587521'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Company' WHERE `id` = '1174511197735665665'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Position' WHERE `id` = '1174509082208395266'; +-- 项目状态 project_status 2022-08-12 +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Development' WHERE `id` = '1513769417081630721'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Production' WHERE `id` = '1513769467044179970'; + + +-- 表字段 英文修改 2022-08-11 +-- OCR识别转换记录表 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Result' WHERE `id` = '6b29f1c0e03533bb380c5ead03195785'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Time' WHERE `id` = '85894f5ad04de66ccf45ebd96c97b534'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Text Status' WHERE `id` = '0240325189062ca96d262e44ccb5811b'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'File Name' WHERE `id` = 'a049f9915ab5f6be06d4b56f609b75ca'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sync State' WHERE `id` = 'e560314880e6097deb64594262e09dab'; +-- 文档拆分表 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Split Time' WHERE `id` = '29c73fd0b2eeacb9870ab32f2f82eb3d'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Text Status' WHERE `id` = '804ff1fcbca3f47bdc9009b34069a9c5'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'File Name' WHERE `id` = 'c975087db4023e6e4a5b3732f0835e2e'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Split Result' WHERE `id` = 'e071def461ccb368dd9ae0ad4f982bc7'; +-- 文档拆分条款信息表 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Info Type' WHERE `id` = '09fa6530229280174071eae0514e0f63'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHERE `id` = '0a455895498552bc709dff250b3364b1'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d'; +-- 文档库信息表 2022-08-12 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Standard Type' WHERE `id` = '441588d80cc31ce68fbdf2ce8b36f93c'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Area' WHERE `id` = '9f82d58f22a12792a53e202d64a39f06'; +-- 参数项收集清单 2022-08-12 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Batch' WHERE `id` = '161c35a16e92682972dd1aeb26151fa2'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Name' WHERE `id` = 'e586bd87d4d826ce3d7d373caf54c6f6'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Status' WHERE `id` = '9050dc65a7b2fe82927b74a9ef4a4bb4'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Field' WHERE `id` = 'ed57f77975218560b37ea497a20109c6'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b'; diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java index f8ac4228e..42b84225e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java @@ -85,11 +85,11 @@ public class JeroBootExceptionHandler { /** * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException */ - @ExceptionHandler(MaxUploadSizeExceededException.class) - public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { - log.error(e.getMessage(), e); - return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); - } +// @ExceptionHandler(MaxUploadSizeExceededException.class) +// public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { +// log.error(e.getMessage(), e); +// return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! "); +// } @ExceptionHandler(DataIntegrityViolationException.class) public Result handleDataIntegrityViolationException(DataIntegrityViolationException e) { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java index ce0611de7..2f8df3da9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java @@ -11,15 +11,15 @@ import java.util.Map; * @Date: Created in 15:17 2022/5/7 */ public enum CollectManifestStateEnum { - WAIT_COLLECT("待发起收集","Wait Collect","1"), - WAIT_SDT("待工程接口人处理","Wait Sdt","2"), - SDT_BACK("工程接口人退回","Sdt Back","3"), - WAIT_FILL("待填写","Wait Fill","4"), - DRE_BACK("填写人退回","Dre Back","5"), - SUBMIT("已提交","Submit","6"), - CERT_BACK("认证工程师退回","Cert Back","7"), - SYNC_REPORT("已同步至上报库","Sync Report","8"), - CHANGE("变更","Change","9"); + WAIT_COLLECT("待发起收集","To be collected","1"), + WAIT_SDT("待工程接口人处理","To be processed by eng. interface","2"), + SDT_BACK("工程接口人退回","Rejected by eng. interface","3"), + WAIT_FILL("待填写","To be filled","4"), + DRE_BACK("填写人退回","Rejected by the applicant","5"), + SUBMIT("已提交","Submitted","6"), + CERT_BACK("认证工程师退回","Rejected by homo engineer","7"), + SYNC_REPORT("已同步至上报库","Synced to library","8"), + CHANGE("变更","Modify","9"); String name; String enName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java index 15938c07a..b48150942 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java @@ -9,9 +9,9 @@ import java.util.List; * @Date: Created in 16:47 2022/5/11 */ public enum CollectManifestUserTypeEnum { - HOMO("认证工程师", "Homologation Engineer", "homo"), - SDT("工程接口人", "Sdt People","sdt"), - DRE("填写人", "Dre People","dre"), + HOMO("认证工程师", "Homo Engineer", "homo"), + SDT("工程接口人", "Eng. Interface","sdt"), + DRE("填写人", "Filled by","dre"), STUDIO("R&H Studio","R&H Studio","studio"), MANAGER("R&H Manager","R&H Manager","manager"), ADMIN("系统","Administrator","admin"), diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index a54eedb2b..0bba80865 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1063,10 +1063,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { @@ -1079,7 +1084,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.HOMO.getName()); @@ -1090,7 +1095,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.SDT.getName()); @@ -1101,7 +1106,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.DRE.getName()); @@ -1112,7 +1117,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { map.put("label", CollectManifestUserTypeEnum.STUDIO.getName()); @@ -1140,6 +1145,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl toLowerCaseOfList(List list) { + List newList = list; + if (CollectionUtil.isNotEmpty(list)) { + newList = list.stream().map(String::toLowerCase).collect(Collectors.toList()); + } + return newList; + } + @Override public Map isCollectFinished(String paramsManifestId) { Map map = new HashMap<>(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 8316dee8e..b2dadc5c4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -386,7 +386,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params); @@ -950,7 +950,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { - String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"}; + String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"}; params.setImportFields(fields); ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); @@ -1235,7 +1235,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl impl public OSSFile uploadLocal(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); try { @@ -146,7 +146,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); } } } @@ -191,15 +191,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalOfCos(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; @@ -265,7 +265,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); } } } @@ -296,15 +296,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalForSplit(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; @@ -357,7 +357,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 00968a75d..443b87522 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -100,7 +100,7 @@ public class SysDepartController { @ApiOperation(value = "部门管理-查询树状结构") @RequiresPermissions("sys:depart:list") @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) - public Result> queryTreeList() { + public Result> queryTreeList(@RequestParam(name = "cut", required = false) String cut) { Result> result = new Result<>(); try { // 从内存中读取 @@ -108,7 +108,7 @@ public class SysDepartController { // if (CollectionUtils.isEmpty(list)) { // list = sysDepartService.queryTreeList(); // } - List list = sysDepartService.queryTreeList(); + List list = sysDepartService.queryTreeList(cut); result.setResult(list); result.setSuccess(true); } catch (Exception e) { @@ -272,7 +272,9 @@ public class SysDepartController { */ @RequiresPermissions("sys:depart:list") @RequestMapping(value = "/searchBy", method = RequestMethod.GET) - public Result> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) { + public Result> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord, + @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch, + @RequestParam(name = "cut", required = false) String cut) { Result> result = new Result>(); //部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -280,7 +282,7 @@ public class SysDepartController { if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ departIds = user.getDepartIds(); } - List treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds); + List treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds,cut); if (treeList == null || treeList.size() == 0) { result.setSuccess(false); result.setMessage("未查询匹配数据！"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 25213835a..9d8a7a787 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -14,6 +14,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.util.JwtUtil; @@ -1486,7 +1487,7 @@ public class SysUserController { Result> result = new Result<>(); //获取当前组织下数据 - List departTreeModelList = sysDepartService.queryTreeListByDepartId(departId); + List departTreeModelList = sysDepartService.queryTreeListByDepartId(departId, sysPushVO.getCut()); if (StringUtils.isNotEmpty(departId)) { List departIds = new ArrayList<>(); departIds.add(departId); @@ -1537,7 +1538,7 @@ public class SysUserController { @AutoLog(value = "文档库推送部门和人员的模糊搜索") @ApiOperation(value="文档库推送部门和人员的模糊搜索", notes="文档库推送部门和人员的模糊搜索") @GetMapping(value = "/getUserAndDepart") - public List getUserAndDepart(String name){ + public List getUserAndDepart(String name, String cut){ if("%".equals(name)){ name = "/%"; } @@ -1546,7 +1547,11 @@ public class SysUserController { List sysUserList = sysUserService.list(lambdaQueryWrapper); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(SysDepart::getDepartName,name); + if (CutEnum.EN.getValue().equals(cut)) { + wrapper.like(SysDepart::getDepartNameEn, name); + } else { + wrapper.like(SysDepart::getDepartName, name); + } List sysDepartList = sysDepartService.list(wrapper); List list = new LinkedList<>(); @@ -1554,7 +1559,11 @@ public class SysUserController { for (SysDepart sysDepart : sysDepartList) { SysUserDepartVO sysUserDepartVO = new SysUserDepartVO(); sysUserDepartVO.setKey(sysDepart.getId()); - sysUserDepartVO.setTitle(sysDepart.getDepartName()); + if (CutEnum.EN.getValue().equals(cut)) { + sysUserDepartVO.setTitle(sysDepart.getDepartNameEn()); + } else { + sysUserDepartVO.setTitle(sysDepart.getDepartName()); + } sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue()); list.add(sysUserDepartVO); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java index 68fbad730..6797f735b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java @@ -51,7 +51,7 @@ public class PPEmployee { private String data_provider; // 第三方数据提供商 private String extension_attribute1; // O365标签 private String working_hour; // 工作制 - private String domain; // 账号所属域 + private String domain; // 账号所属域 美国-amer private String ad_failed; // 创建ad失败原账号 private String have_employees; // 是否有下属员工 private String id; // id ----id diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java index 667744bd1..4893c132c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java @@ -27,9 +27,9 @@ public interface ISysDepartService extends IService{ * 查询所有部门信息,并分节点进行显示 * @return */ - List queryTreeList(); + List queryTreeList(String cut); - List queryTreeListByDepartId(String departId); + List queryTreeListByDepartId(String departId, String cut); /** * 查询所有部门DepartId信息,并分节点进行显示 @@ -62,7 +62,7 @@ public interface ISysDepartService extends IService{ * @param keyWord * @return */ - List searhBy(String keyWord,String myDeptSearch,String departIds); + List searhBy(String keyWord,String myDeptSearch,String departIds,String cut); /** * 根据部门id删除并删除其可能存在的子级部门 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index a50b39aab..5be73965b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -227,7 +227,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ JSONObject resultJsonEU = (JSONObject) myJsonEU.get("data"); //将第一页的账户信息转换为本地dto集合 List userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); //获取总记录数 @@ -246,7 +246,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ log.debug("【欧洲】打印输出本次同步信息返回结果:"+myJsonEU.get("data").toString()); resultJsonEU = (JSONObject) myJsonEU.get("data"); userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); } } @@ -261,21 +261,22 @@ public class SyncDataServiceImpl implements ISyncDataService{ for(PPEmployee ppEmployee:ppEmployeeList){ try { PPEmployeeMap.put(ppEmployee.getWorker_user_id(), ppEmployee); - //1.判断当前账号是否已添加到用户中 - if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) { - //删除数据库中与该账户相同的数据 - if(StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) { + if (StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) { + ppEmployee.setWorker_user_id(ppEmployee.getWorker_user_id().toLowerCase()); // 转小写 + + //1.判断当前账号是否已添加到用户中 + if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) { + //删除数据库中与该账户相同的数据 // sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除 log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee)); SysUser newUser = sysUserService.addPPUserInfo(ppEmployee); localUserMap.put(ppEmployee.getWorker_user_id(), newUser); - } - - } else { - SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id()); - log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); - if(userEO != null) { - sysUserService.updatePPUserInfo(userEO, ppEmployee); + }else { + SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id()); + log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); + if (userEO != null) { + sysUserService.updatePPUserInfo(userEO, ppEmployee); + } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index b3a914e79..02027b250 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.FillRuleUtil; import com.jero.common.util.YouBianCodeUtil; @@ -70,7 +71,7 @@ public class SysDepartServiceImpl extends ServiceImpl listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts, null); return listResult; } @@ -79,20 +80,20 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeList() { + public List queryTreeList(String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.last("order by depart_order is null, depart_order asc"); List list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, cut); return listResult; } // @Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE) @Override - public List queryTreeListByDepartId(String departId) { + public List queryTreeListByDepartId(String departId, String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); if (StringUtils.isBlank(departId)) { query.isNull(SysDepart::getParentId); @@ -108,7 +109,7 @@ public class SysDepartServiceImpl extends ServiceImpl */ @Override - public List searhBy(String keyWord,String myDeptSearch,String departIds) { + public List searhBy(String keyWord,String myDeptSearch,String departIds,String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); List newList = new ArrayList<>(); //myDeptSearch不为空时为我的部门搜索，只搜索所负责部门 @@ -317,7 +318,12 @@ public class SysDepartServiceImpl extends ServiceImpl departList = this.list(query); @@ -325,7 +331,7 @@ public class SysDepartServiceImpl extends ServiceImpl list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, null); List treelist =new ArrayList<>(); if(StringUtils.isNotBlank(keyWord)){ this.getTreeByKeyWord(keyWord,listResult,treelist); @@ -519,7 +525,7 @@ public class SysDepartServiceImpl extends ServiceImpl sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult); + List sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult, null); realResult.addAll(sysDepartTreeModels); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java index ce47aa0ab..18be6e865 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java @@ -1,12 +1,10 @@ package com.jero.modules.system.util; -import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.SysDepartTreeModel; -import com.jero.common.util.RedisUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.model.DepartIdModel; -import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; @@ -32,7 +30,7 @@ public class FindsDepartsChildrenUtil { * queryTreeList的子方法 ====1===== * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合 */ - public static List wrapTreeDataToTreeList(List recordList) { + public static List wrapTreeDataToTreeList(List recordList, String cut) { // 在该方法每请求一次,都要对全局list集合进行一次清理 //idList.clear(); List idList = new ArrayList(); @@ -41,7 +39,7 @@ public class FindsDepartsChildrenUtil { SysDepart depart = recordList.get(i); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); // 将sysDepart转换为sysDepartTreeModel - convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); + convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut); records.add(sysDepartTreeModel); } List tree = findChildren(records, idList); @@ -63,7 +61,7 @@ public class FindsDepartsChildrenUtil { SysDepart depart = recordList.get(i); SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); // 将sysDepart转换为sysDepartTreeModel - convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel); + convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, null); records.add(sysDepartTreeModel); } findChildren(records, idList); @@ -144,10 +142,14 @@ public class FindsDepartsChildrenUtil { * @param sysDepartTreeModel 转换的结果对象 * @return */ - public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel){ + public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel, String cut){ sysDepartTreeModel.setKey( sysDepart.getId()); sysDepartTreeModel.setValue( sysDepart.getId()); - sysDepartTreeModel.setTitle(sysDepart.getDepartName()); + if (CutEnum.EN.getValue().equals(cut)) { // 部门名称中英文处理 + sysDepartTreeModel.setTitle(sysDepart.getDepartNameEn()); + } else { + sysDepartTreeModel.setTitle(sysDepart.getDepartName()); + } sysDepartTreeModel.setId(sysDepart.getId()); sysDepartTreeModel.setParentId(sysDepart.getParentId()); sysDepartTreeModel.setDepartName(sysDepart.getDepartName()); @@ -169,4 +171,5 @@ public class FindsDepartsChildrenUtil { sysDepartTreeModel.setUpdateBy(sysDepart.getUpdateBy()); sysDepartTreeModel.setUpdateTime(sysDepart.getUpdateTime()); } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 90b5f1dd9..696355fcb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -2,14 +2,13 @@ package com.jero.modules.compare.controller; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; @@ -17,6 +16,8 @@ import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -50,22 +51,34 @@ public class SarFileCompareInfoController extends JeroController queryPageList(SarFileCompareInfo sarFileCompareInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(name = "cut", defaultValue = "cn") String cut, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); + public Result queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "cut", defaultValue = "cn") String cut, + @RequestParam(name = "serialNumber", defaultValue = "") String serialNumber, + @RequestParam(name = "title", defaultValue = "") String title, + @RequestParam(name = "releaseState", defaultValue = "") String releaseState, + HttpServletRequest req) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.DRAFT.getValue()); - Page page = new Page(pageNo, pageSize); + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getCreateBy, sysUser.getUsername()).or().eq(SarFileCompareInfo::getReleaseState, ReleaseConditionEnum.PUBLISHED.getValue())); + if (StringUtils.isNotBlank(serialNumber)) { + String finalSerialNumber = serialNumber.replace("%", "\\%");; + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.like(SarFileCompareInfo::getSerialNumberLeft, finalSerialNumber).or().like(SarFileCompareInfo::getSerialNumberRight, finalSerialNumber)); + + } + if (StringUtils.isNotBlank(title)) { + String finalTitle = title.replace("%", "\\%"); + queryWrapper.and(i -> i.like(SarFileCompareInfo::getTitleLeft, finalTitle).or().like(SarFileCompareInfo::getTitleRight, finalTitle)); + } + if (StringUtils.isNotBlank(releaseState)) { + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getReleaseState, releaseState)); + } + queryWrapper.orderByDesc(SarFileCompareInfo::getCreateTime); + Page page = new Page<>(pageNo, pageSize); IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); for (SarFileCompareInfo info : pageList.getRecords()) { info.setReleaseStateTitle(ReleaseConditionEnum.getTextByValue(info.getReleaseState(), cut)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index e0dfcc381..24d378f67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.compare.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.compare.entity.*; import com.jero.modules.compare.mapper.SarFileCompareInfoMapper; @@ -9,6 +10,7 @@ import com.jero.modules.compare.service.ISarFileCompareMenuService; import com.jero.modules.compare.utils.CompHanLPUtils; import com.jero.modules.compare.utils.CompareConst; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; @@ -44,6 +46,9 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(leftInfo.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { + sarFileCompareInfo.setFileKeyLeft(bussDocumentLibraryEOList.get(0).get("id").toString()); + } sarFileCompareInfo.setFileNameLeft(leftInfo.getFileName()); sarFileCompareInfo.setTitleLeft(leftInfo.getTitle()); sarFileCompareInfo.setFileTypeLeft(leftInfo.getFileType()); sarFileCompareInfo.setSerialNumberLeft(leftInfo.getSerialNumber()); - sarFileCompareInfo.setFileIdRight(rightInfo.getId()); - sarFileCompareInfo.setFileKeyRight(rightInfo.getFileId()); + sarFileCompareInfo.setFileIdRight(rightInfo.getFileId()); + // 处理文档库id字段 根据编号和标题查询 + List> bussDocumentLibraryEOList1 = bussDocumentLibraryEOService.getListBySerialNumber(rightInfo.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList1)) { + sarFileCompareInfo.setFileKeyRight(bussDocumentLibraryEOList1.get(0).get("id").toString()); + } + sarFileCompareInfo.setFileKeyRight(rightInfo.getConnectId()); sarFileCompareInfo.setFileNameRight(rightInfo.getFileName()); sarFileCompareInfo.setFileTypeRight(rightInfo.getFileType()); sarFileCompareInfo.setTitleRight(rightInfo.getTitle()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index 2b4646201..61c51b882 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -193,7 +193,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl 1) { + msgEndStr = " have been deleted from the document library."; + } + String msgContent = "The standard " + StringUtils.join(serialNumberListTemp,",") + msgEndStr; homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContent); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); @@ -2143,8 +2147,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); @@ -2634,8 +2638,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ - String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); - String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1); + String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1) + "."; + String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1) + "."; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo); @@ -4571,7 +4575,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> queryList() { - List list = extRepoFolderService.queryTreeList(); - return Result.OK(list); + public Result queryList() { + ERFTreeDataVO dataVO = new ERFTreeDataVO(); + dataVO.setManager(extRepoFolderService.isManager()); + dataVO.setList(extRepoFolderService.queryTreeList()); + return Result.OK(dataVO); } /** @@ -61,6 +64,11 @@ public class ExtRepoFolderController extends JeroController add(@Validated @RequestBody ExtRepoFolder extRepoFolder) { Result result = new Result(); if (extRepoFolderService.haveManageAuth(extRepoFolder.getSupFolder())) { + if (!extRepoFolder.isAddSub()) { + //增加同级文件夹 + ExtRepoFolder folder = extRepoFolderService.queryById(extRepoFolder.getSupFolder()); + extRepoFolder.setSupFolder(folder.getSupFolder()); + } extRepoFolderService.add(extRepoFolder); if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { result.success("添加成功！"); @@ -120,15 +128,25 @@ public class ExtRepoFolderController extends JeroController resList = extRepoFolderService.getListBySupFolder(id); if (resList.isEmpty()) { - List erdList = extRepoDataService.queryByFolder(id); - for (ExtRepoData erd : erdList) { - extRepoDataService.deleteById(erd.getId()); - } - extRepoFolderService.deleteById(id); - if (CutEnum.CN.getValue().equals(cut)) { - result.success("删除成功！"); + ExtRepoFolder erf = extRepoFolderService.queryById(id); + int count = getRootFolderCount(); + if (erf.getSupFolder().equals("root") && count <= 1) { + if (CutEnum.CN.getValue().equals(cut)) { + result.error500("此文件夹不可删除！"); + } else { + result.error500("This folder cannot be deleted!"); + } } else { - result.success("Data deletion successfully!"); + List erdList = extRepoDataService.queryByFolder(id); + for (ExtRepoData erd : erdList) { + extRepoDataService.deleteById(erd.getId()); + } + extRepoFolderService.deleteById(id); + if (CutEnum.CN.getValue().equals(cut)) { + result.success("删除成功！"); + } else { + result.success("Data deletion successfully!"); + } } } else { if (CutEnum.CN.getValue().equals(cut)) { @@ -147,6 +165,13 @@ public class ExtRepoFolderController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExtRepoFolder::getSupFolder, "root"); + return extRepoFolderService.count(queryWrapper); + } + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java index d9d65aecd..0b0152705 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java @@ -36,13 +36,6 @@ public class ERFTreeData implements Comparable { */ private int orderId; - - /** - * 是否显示 - */ - private boolean display = false; - - /** * 查看权限人员 */ @@ -119,14 +112,6 @@ public class ERFTreeData implements Comparable { this.orderId = orderId; } - public boolean isDisplay() { - return display; - } - - public void setDisplay(boolean display) { - this.display = display; - } - public String getFolderName() { return folderName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java new file mode 100644 index 000000000..ba073d51e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java @@ -0,0 +1,27 @@ +package com.jero.modules.extRepo.entity; + +import java.util.List; + +public class ERFTreeDataVO { + boolean isManager; + List list; + + public ERFTreeDataVO() { + } + + public boolean isManager() { + return isManager; + } + + public void setManager(boolean manager) { + isManager = manager; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java index c34293c87..a99d600d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java @@ -96,4 +96,7 @@ public class ExtRepoFolder implements Serializable { @TableField(exist = false) private String cut; + + @TableField(exist = false) + private boolean addSub; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index 824106d33..30df6c310 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -22,10 +22,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 对外报告文件夹表 - * @Author: jero-boot - * @Date: 2022-07-25 - * @Version: V1.0 + * 对外报告文件夹表 */ @Service public class ExtRepoFolderServiceImpl extends ServiceImpl implements IExtRepoFolderService { @@ -38,9 +35,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl list = getListBySupFolder(extRepoFolder.getSupFolder()); for (ExtRepoFolder erf : list) { if (erf.getOrderId() >= extRepoFolder.getOrderId() && !erf.getId().equals(extRepoFolder.getId())) { @@ -90,9 +79,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl authManage_orig = getAuthMap(erf_orig.getAuthManageIdsName(), erf_orig.getAuthManageIds()); Map authManage_new = getAuthMap(erf_new.getAuthManageIdsName(), erf_new.getAuthManageIds()); @@ -132,20 +118,20 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl allSubFolder = getAllSubFolder(erf_orig.getId()); //存储变化的对象 - List updateFolder = new ArrayList(); + List updateFolder = new ArrayList<>(); for (ExtRepoFolder erf : allSubFolder) { boolean isChange = false; Map authManage_erf = getAuthMap(erf.getAuthManageIdsName(), erf.getAuthManageIds()); Map authView_erf = getAuthMap(erf.getAuthViewIdsName(), erf.getAuthViewIds()); for (String add : addManageRole.keySet()) { - if (!authManage_erf.keySet().contains(add)) { + if (!authManage_erf.containsKey(add)) { authManage_erf.put(add, addManageRole.get(add)); isChange = true; } } for (String del : delManageRole.keySet()) { //如果是创建人 不能删除管理权限 - if (authManage_erf.keySet().contains(del)) { + if (authManage_erf.containsKey(del)) { if (!del.equals(erf_orig.getCreateBy())) { authManage_erf.remove(del); isChange = true; @@ -153,13 +139,13 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getDefMap(Map mapA, Map mapB) { - Map res = new HashMap(); + Map res = new HashMap<>(); for (String s : mapA.keySet()) { - if (StringUtils.isNotBlank(s) && !mapB.keySet().contains(s)) { + if (StringUtils.isNotBlank(s) && !mapB.containsKey(s)) { res.put(s, mapA.get(s)); } } @@ -196,7 +178,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getAllSubFolder(String folderId) { List resList = getListBySupFolder(folderId); - List subList = new ArrayList(); + List subList = new ArrayList<>(); for (ExtRepoFolder erf : resList) { subList.addAll(getAllSubFolder(erf.getId())); } @@ -206,9 +188,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryList() { @@ -243,8 +217,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryTreeList() { @@ -262,34 +234,31 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getSubFolder(String supId, List list, int level) throws Exception { - List resList = new ArrayList(); + private List getSubFolder(String supId, List list, int level) { + List resList = new ArrayList<>(); for (ExtRepoFolder erf : list) { if (supId.equals(erf.getSupFolder())) { - ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); - //检查有没有权限查看 - date.setDisplay(haveViewAuth(erf.getSupFolder())); - int childLevel = date.getLevel() + 1; - date.setAuthManageIdsName(erf.getAuthManageIdsName()); - date.setAuthManageIds(erf.getAuthManageIds()); - date.setAuthViewIdsName(erf.getAuthViewIdsName()); - date.setAuthViewIds(erf.getAuthViewIds()); - date.setChildren(getSubFolder(erf.getId(), list, childLevel)); - date.sortChildren(); - resList.add(date); + int childLevel = level + 1; + if (haveViewAuth(erf.getId())) { + ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); + date.setAuthManageIdsName(erf.getAuthManageIdsName()); + date.setAuthManageIds(erf.getAuthManageIds()); + date.setAuthViewIdsName(erf.getAuthViewIdsName()); + date.setAuthViewIds(erf.getAuthViewIds()); + date.setChildren(getSubFolder(erf.getId(), list, childLevel)); + date.sortChildren(); + resList.add(date); + } else { + resList.addAll(getSubFolder(erf.getId(), list, childLevel)); + } } } return resList; } private List getStringList(String listStr) { - List res = new ArrayList(); + List res = new ArrayList<>(); if (null != listStr) { res = Arrays.asList(listStr.split(",")); } @@ -297,7 +266,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getAuthMap(String strKey, String strValue) { - Map resMap = new HashMap(); + Map resMap = new HashMap<>(); List keyList = getStringList(strKey); List valueList = getStringList(strValue); for (int i = 0; i < keyList.size(); i++) { @@ -308,19 +277,17 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl userRoles = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, loginUser.getId())); // 查询用户所有角色 - List userRoleIds = new ArrayList<>(); // 用户管理员/对外报告管理员 + List userRoleIds; // 用户管理员/对外报告管理员 if (CollectionUtil.isNotEmpty(userRoles)) { List roleIdList = ExtRepoMamagerRoleIdEnum.getIdList(); List userRoleIdList = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); - userRoleIds = roleIdList.stream().filter(e -> userRoleIdList.contains(e)).collect(Collectors.toList()); + userRoleIds = roleIdList.stream().filter(userRoleIdList::contains).collect(Collectors.toList()); return !CollectionUtil.isEmpty(userRoleIds); } return false; @@ -328,13 +295,10 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); + JSONArray actions = new JSONArray(); + + //组装推送过去的点击按钮 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { JSONObject buttonObject = new JSONObject(); JSONObject text = new JSONObject(); JSONObject value = new JSONObject(); buttonObject.put("tag","button"); - if(i==0){ - text.put("tag","plain_text"); - text.put("content","content1"); + text.put("tag","plain_text"); + text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel()); + value.put("chosen",problemKnowledgeBaseClassifyEO.getId()); - value.put("chosen","chosen1"); - } - if(i==1){ - text.put("tag","plain_text"); - text.put("content","content2"); - - value.put("chosen","chosen2"); - } - if(i==2){ - text.put("tag","plain_text"); - text.put("content","content3"); - - value.put("chosen","chosen3"); - } - if(i==3){ - text.put("tag","plain_text"); - text.put("content","content4"); - - value.put("chosen","chosen4"); - } - if(i==4){ - text.put("tag","plain_text"); - text.put("content","content5"); - - value.put("chosen","chosen5"); - } - if(i==5){ - text.put("tag","plain_text"); - text.put("content","content6"); - - value.put("chosen","chosen6"); - } buttonObject.put("text",text); buttonObject.put("type","primary"); buttonObject.put("value",value); actions.add(buttonObject); } + element.put("actions",actions); @@ -423,12 +432,94 @@ public class FeishuServiceImpl implements IFeishuService { String clickStr = JSONObject.toJSONString(JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("action"))).get("value")); log.info("用户点击的数据: " + clickStr); - String sendJson = " "; + String sendJsonStr = "{\n" + + " \"config\": {\n" + + " \"wide_screen_mode\": true\n" + + " },\n" + + " \"header\": {\n" + + " \"title\": {\n" + + " \"tag\": \"plain_text\",\n" + + " \"content\": \"问题知识库信息，点击下方标题即可跳转至详情页查看\"\n" + + " },\n" + + " \"template\": \"green\"\n" + + " }\n" + + "}"; + + JSONObject sendJson = JSONObject.parseObject(sendJsonStr); + JSONArray elements = new JSONArray(); + + //分隔行对象。 + JSONObject dividingLineJson = new JSONObject(); + dividingLineJson.put("tag","hr"); JSONObject clickJson = JSONObject.parseObject(clickStr); if(StringUtils.isNotEmpty(clickJson.getString("chosen"))){ - sendJson = clickJson.getString("chosen"); + String problemTypeId = clickJson.getString("chosen"); + String thirdId = userIds[0]; + SysUser currentOperatorUser = this.sysUserService.getBaseMapper().selectOne( + new QueryWrapper().lambda().eq(SysUser::getThirdId, thirdId) + ); + if(ObjectUtils.isNotEmpty(currentOperatorUser)){ + QueryWrapper userPermissionQueryWrapper = new QueryWrapper<>(); + userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentOperatorUser.getId()); + List problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); + + List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + + QueryWrapper problemKnowledgeBaseEOQueryWrapper = new QueryWrapper<>(); + + problemKnowledgeBaseEOQueryWrapper.lambda().eq(ProblemKnowledgeBaseEO::getProblemType,problemTypeId); + problemKnowledgeBaseEOQueryWrapper.lambda().and(query -> { + query.eq(ProblemKnowledgeBaseEO::getShowPermissions, ShowPermissionsEnum.OPEN.getValue()). + or(o -> { + o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue()); + o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); + }); + }); + + //根据发布日期倒序 查询出（公开、私密且自己是权限用户）最新的五条数据 + problemKnowledgeBaseEOQueryWrapper.orderByDesc("release_time"); + Integer pageNo = 1; + Integer pageSize = 5; + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseEOService.page(page, problemKnowledgeBaseEOQueryWrapper); + List records = pageList.getRecords(); + + JSONObject element = new JSONObject(); + JSONArray actions = new JSONArray(); + + for (ProblemKnowledgeBaseEO record : records) { + String url = backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE_DETAIL.getLink() + "?id=" + record.getId(); + + JSONObject action = new JSONObject(); + JSONObject text = new JSONObject(); + action.put("tag","button"); + + text.put("tag","plain_text"); + text.put("content",record.getTitle()); + action.put("text",text); + action.put("type","primary"); + action.put("url",url); + actions.add(action); + } + + element.put("tag","action"); + element.put("actions",actions); + elements.add(element); + //添加一个分隔线。 + elements.add(dividingLineJson); + } } + JSONObject textFinally = new JSONObject(); + textFinally.put("tag","lark_md"); + textFinally.put("content","[以上都不是>>]("+backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE.getLink()+")"); + + JSONObject elementFinally = new JSONObject(); + elementFinally.put("tag","div"); + elementFinally.put("text",textFinally); + elements.add(elementFinally); + + sendJson.put("elements",elements); String token = null; try { @@ -440,30 +531,92 @@ public class FeishuServiceImpl implements IFeishuService { Map headerMap = new HashMap<>(); headerMap.put("Authorization", "Bearer " + token); headerMap.put("Content-Type", "application/json; charset=utf-8"); - // 设置消息标题 - JSONObject zh_cn = new JSONObject(); - zh_cn.put("title", "title"); - // 设置消息内容 - // 第一行 - JSONObject contentOne = new JSONObject(); - contentOne.put("tag", "text"); - contentOne.put("text", sendJson); - List contentList = new ArrayList<>(); - contentList.add(contentOne); - List> list = new ArrayList<>(); - list.add(contentList); - zh_cn.put("content", list); - - JSONObject post = new JSONObject(); - post.put("zh_cn", zh_cn); - JSONObject contentObj = new JSONObject(); - contentObj.put("post", post); // 设置请求参数 JSONObject paramsMap = new JSONObject(); paramsMap.put("user_ids", userIds); - paramsMap.put("msg_type", "post"); - paramsMap.put("content", contentObj); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", sendJson); + + // 发送请求给飞书 + String response = null; + try { + response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + } catch (IOException e) { + e.printStackTrace(); + } + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + } + + @Override + public void sendKnowledgeBaseTypeChargePersonCard(String[] userIds) { + String token = null; + try { + token = getTenantAccessToken(); + } catch (IOException e) { + e.printStackTrace(); + } + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + String sendJson = " {\n" + + " \"config\": {\n" + + " \"wide_screen_mode\": true\n" + + " },\n" + + " \"header\": {\n" + + " \"title\": {\n" + + " \"tag\": \"plain_text\",\n" + + " \"content\": \"点击下方的分类查看常见问题\"\n" + + " },\n" + + " \"template\": \"green\"\n" + + " }\n" + + "}"; + JSONObject jsonObject = JSONObject.parseObject(sendJson); + JSONArray elements = new JSONArray(); + JSONObject element = new JSONObject(); + element.put("tag","action"); + element.put("layout","bisected"); + + //获取分类 + List problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); + this.problemKnowledgeBaseClassifyEOService.disposeData(problemKnowledgeBaseClassifyEOList); + + JSONArray actions = new JSONArray(); + + //组装推送过去的点击按钮 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { + JSONObject buttonObject = new JSONObject(); + JSONObject text = new JSONObject(); + JSONObject value = new JSONObject(); + buttonObject.put("tag","button"); + + text.put("tag","plain_text"); + text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel() + " [" + problemKnowledgeBaseClassifyEO.getChargePersonIdName() + "]"); + value.put("chosen",problemKnowledgeBaseClassifyEO.getChargePersonId()); + + buttonObject.put("text",text); + buttonObject.put("type","primary"); + buttonObject.put("value",value); + actions.add(buttonObject); + } + + element.put("actions",actions); + + + elements.add(element); + jsonObject.put("elements",elements); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + // 发送请求给飞书 String response = null; try { @@ -471,7 +624,6 @@ public class FeishuServiceImpl implements IFeishuService { } catch (IOException e) { e.printStackTrace(); } - // 返回结果样例：{"code":0,"data":{"invalid_department_ids":[],"invalid_open_ids":[],"invalid_union_ids":[],"invalid_user_ids":[],"message_id":"bm-d595567e4f448fafe397bc916f0be646"},"msg":"ok"} // 获取返回结果 JSONObject tokenJson = JSONObject.parseObject(response); if(!tokenJson.get("code").toString().equals("0")) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java index 631a32d97..0aee3596c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java @@ -24,5 +24,7 @@ public class FeishuMsgVo { private String url; //回调的网址 + private String assignee; //评估人 适用范围：责任人提交通知发起人（设计符合性，pre-homo符合性，验证符合性） + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java index 0ccda417a..29757efa8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java @@ -214,7 +214,11 @@ public class OcrRecordEOServiceImpl extends ServiceImpl> queryList() { - List list = countryCardManageReleaseEOService.queryList(); - return Result.OK(list); + public Result> queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + @RequestParam(name="cut", defaultValue="cn") String cut) { + List list = countryCardManageReleaseEOService.queryList(countryCardManageReleaseEO,req,cut); + return Result.OK(cut,list); } /** @@ -194,8 +196,9 @@ public class CountryCardManageReleaseEOController extends JeroController> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag) { - Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag); + public Result> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag, + @RequestParam(name = "cut",required = true) String cut) { + Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag,cut); return result; } @@ -208,7 +211,8 @@ public class CountryCardManageReleaseEOController extends JeroController> queryCountryCardManageReleaseByApplyMarkets(@RequestBody JSONObject params) { + String cut = params.getString("cut"); List list = countryCardManageReleaseEOService.queryCountryCardManageReleaseByApplyMarkets(params); - return Result.OK(list); + return Result.OK(cut,list); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java index 9f53f8850..9aba556d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java @@ -84,6 +84,10 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @ApiModelProperty(value = "内容") private java.lang.String content; + /**如果是下拉选的话，把翻译后的值放到此字段中。*/ + @TableField(exist = false) + private java.lang.String contentDropDownValue; + @TableField(exist = false) private String cut; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index 7287306a9..7d63858bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -72,12 +72,19 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**问题分类展示名称*/ @TableField(exist = false) private java.lang.String problemTypeName; + /**问题分类查询条件字段 多个*/ + @TableField(exist = false) + private java.lang.String problemTypes; - /**市场*/ - @Dict(dicCode = "region") + + /**市场*/ + //@Dict(dicCode = "region") @Excel(name = "市场", width = 15) @ApiModelProperty(value = "市场") private java.lang.String targetMarket; + /**市场展示字段**/ + @TableField(exist = false) + private java.lang.String targetMarket_dicText; /**文档库id*/ @Excel(name = "文档库id", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 392c7e437..0af88f36f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -60,7 +61,9 @@ public interface ICountryCardManageReleaseEOService extends IService queryList(); + List queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + String cut); /** * 处理数据 @@ -79,7 +82,7 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(String queryFlag); + Result> getApplyMarketList(String queryFlag,String cut); List queryCountryCardManageReleaseByApplyMarkets(JSONObject params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java index 54fe486fd..84929756b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java @@ -148,6 +148,19 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(data.getContent(), countryCardTempItemEO.getId())) { + flag = true; + } + return flag; + }).map(CountryCardTempItemEO::getItemText).collect(Collectors.joining(",")); + + //设置下拉框的value + data.setContentDropDownValue(contentDropDownValue); + } } }); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index 0345c59cc..c5226def4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; @@ -29,6 +31,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 问题知识库-country_card-管理发布表 * @Author: jero-boot @@ -123,8 +127,12 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + String cut) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; } @Override @@ -199,7 +207,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl> getApplyMarketList(String queryFlag) { + public Result> getApplyMarketList(String queryFlag,String cut) { List result = new ArrayList<>(); //获取所有的适用地区 @@ -235,7 +243,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl { + data.setText(data.getTextEn()); + }); + } + return Result.OK(result); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java index 8bb1d4c49..c81eb6e64 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; @@ -70,6 +71,7 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl { + tempItem.setItemText(tempItem.getEnName()); + }); + } + countryCardTemp.setCountryCardTempItemEOList(collect); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 0455d852a..cad2b60e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -1,7 +1,9 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.problemKnowledgeBase.entity.*; import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum; @@ -9,6 +11,8 @@ import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum; import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.*; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; @@ -44,6 +48,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List finalProblemKnowledgeBaseClassifyEOList = problemKnowledgeBaseClassifyEOList; datas.forEach(data -> { @@ -298,6 +305,30 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(targetMarket, region.getValue())) { + flag = true; + } + return flag; + }).map(DictModel::getText).collect(Collectors.joining(",")); + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + targetMarket_dicText = regionList.stream().filter(region -> { + boolean flag = false; + if (StringUtils.equals(targetMarket, region.getValue())) { + flag = true; + } + return flag; + }).map(DictModel::getTextEn).collect(Collectors.joining(",")); + } + + data.setTargetMarket_dicText(targetMarket_dicText); + } }); } } @@ -335,5 +366,21 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemTypeList = Arrays.asList(problemTypes.split(",")); + queryWrapper.and(query -> { + query.lambda().like(ProblemKnowledgeBaseEO::getProblemType,problemTypes); + if(CollectionUtils.isNotEmpty(problemTypeList)){ + problemTypeList.forEach(type -> { + query.or(q -> { + q.lambda().like(ProblemKnowledgeBaseEO::getProblemType,type); + }); + }); + } + }); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java index 54aa3225b..85f2b4d9f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java @@ -19,6 +19,9 @@ public enum JumpLinkEnum { DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"), TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""), COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""), + + PROBLEM_KNOWLEDGE_BASE_DETAIL("问题知识库，详情页","","/problemKnowledgeBaseView",""), + PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 34169acd6..13c1ff160 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,16 +1,16 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("清单确认"," Checklist confirmation"), - LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"), - DESIGN_DEADLINE("设计符合性","Design compliance"), + LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), + LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), + DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), // PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), // ATTESTATION_START_TIME("认证开始","Certification begins"), // ATTESTATION_END_TIME("认证结束"," End of certification"), - PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Completion"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证试验结束","Homo Test Completion"),// name:认证开始 value:Certification begins - ATTESTATION_END_TIME("认证批准","Type Approval"),// name:认证结束 value:End of certification - VERIFY_DEADLINE("验证符合性","Verify compliance"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证结束","Homo Completion"),// name:认证开始 value:Certification begins + ATTESTATION_END_TIME("认证开始","Homo KO"),// name:认证结束 value:End of certification + VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), ; String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index d339bf66d..f99726b03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -138,17 +138,17 @@ public class InventoryAffirmJob implements Job { /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务确认剩余处理时间还有3天，请及时查看处理";*/ // XXX . - String msgContentEN = "The remaining processing time for the regulation list confirmation for " + String msgContentEN = "The remaining processing time for the regulation task confirmation for " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + " are 3 days. Please check and handle it in time."; + + " are 3 days. Please check and address it in a timely manner."; String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + ": You have a regulation list confirmation task to complete"; + + ": You have a regulation task confirmation to complete"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setContent("Hello! The remaining processing time for the task are 3 days. Please check and address it in a timely manner."); - feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setTaskType("Regulation Task Confirmation"); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); //飞书跳转链接 @@ -172,22 +172,22 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){ currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList()); /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/ - String msgContentEN = "The regulation list confirmation for " + String msgContentEN = "The regulation task confirmation for " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + " will expire today. Please check and address it in a timely manner."; String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + ": You have a regulation list confirmation task to complete"; + + ": You have a regulation task confirmation to complete"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setContent("Hello! The task will expire today. Please check and address it in a timely manner."); - feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setTaskType("Regulation Task Confirmation"); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); //飞书跳转链接 @@ -210,7 +210,7 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("hrefFeishu",hrefFeishu); sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml index 1e4382b0e..37cf72f37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -16,8 +16,8 @@ LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id ) WHERE ( - bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather) - OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation) + bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather where gather_result = #{params.gatherResult}) + OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation where flow_status = #{params.flowStatus}) or pti.design_p_id IS NOT NULL OR pti.prehomo_p_id IS NOT NULL OR pti.verify_p_id IS NOT NULL @@ -37,10 +37,13 @@ pni.project_name as "projectName", pyni.year_name as "yearName", pti.design_status as "designStatus", + pti.design_flow_task_status as "designFlowTaskStatus", pti.design_p_id as "designPId", pti.prehomo_status as "prehomoStatus", + pti.prehomo_flow_task_status as "prehomoFlowTaskStatus", pti.prehomo_p_id as "prehomoPId", pti.verify_status as "verifyStatus", + pti.verify_flow_task_status as "verifyFlowTaskStatus", pti.verify_p_id as "verifyPId", pli.duty_territory as "dutyTerritory" FROM diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java index 8277a6789..639720188 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -10,10 +10,12 @@ import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.document.vo.QueryConditionVO; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; import com.jero.modules.project.enums.DesignComplianceStatusEnum; +import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.mapper.LawsComplianceBoardMapper; import com.jero.modules.project.service.ILawsComplianceBoardService; import com.jero.modules.system.entity.SysCategory; @@ -68,6 +70,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi //封装查询条件(包含高级搜索) String condition = this.getConditionStr(params); params.put("condition",condition); + //只查询 法规技术评估流程状态、法规意见收集 收集结果 为已完成的数据 + params.put("flowStatus", GatherResultEnum.COMPLETED.getValue()); + params.put("gatherResult", GatherResultEnum.COMPLETED.getValue()); IPage page = new Page(pageNo, pageSize); IPage infoPage = this.lawsComplianceBoardMapper.queryPageList(page, params); List records = infoPage.getRecords(); @@ -139,12 +144,14 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi //查询当前数据是否有法规意见收集流程数据 QueryWrapper opinionGatherEOQueryWrapper = new QueryWrapper<>(); opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getStandId,id); + opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult,GatherResultEnum.COMPLETED.getValue()); int opinionGatherCount = this.lawsOpinionGatherEOService.count(opinionGatherEOQueryWrapper); result.put("opinionGather",opinionGatherCount); //查询当前数据是否有法规技术评估流程数据 QueryWrapper evaluationEOQueryWrapper = new QueryWrapper<>(); evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getStandId,id); + evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus,GatherResultEnum.COMPLETED.getValue()); int evaluationCount = this.lawsTechnologyEvaluationEOService.count(evaluationEOQueryWrapper); result.put("technologyEvaluation",evaluationCount); return result; @@ -166,6 +173,20 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("verifyStatus").toString(), cut); complianceResult.put("verifyStatus_dicText",textByValue); } + + if (complianceResult.get("designFlowTaskStatus") != null) { + String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("designFlowTaskStatus").toString(), cut); + complianceResult.put("designFlowTaskStatus_dicText",textByValue); + } + if (complianceResult.get("prehomoFlowTaskStatus") != null && complianceResult.get("prehomoFlowTaskStatus") != "") { + String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("prehomoFlowTaskStatus").toString(), cut); + complianceResult.put("prehomoFlowTaskStatus_dicText",textByValue); + } + if (complianceResult.get("verifyFlowTaskStatus") != null) { + String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("verifyFlowTaskStatus").toString(), cut); + complianceResult.put("verifyFlowTaskStatus_dicText",textByValue); + } + if (complianceResult.get("dutyTerritory") != null) { String dutyTerritory_dicText = ""; if (CutEnum.EN.getValue().equals(cut)) { @@ -291,9 +312,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi dataRow.createCell(4).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("dutyTerritory_dicText"))); String projectName = checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("projectName")) + "-" + checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("yearName")); dataRow.createCell(5).setCellValue(projectName); - dataRow.createCell(6).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("designStatus_dicText"))); - dataRow.createCell(7).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("prehomoStatus_dicText"))); - dataRow.createCell(8).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("verifyStatus_dicText"))); + dataRow.createCell(6).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("designFlowTaskStatus_dicText"))); + dataRow.createCell(7).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("prehomoFlowTaskStatus_dicText"))); + dataRow.createCell(8).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("verifyFlowTaskStatus_dicText"))); if(byStandIdComlianceResultSize > 1 && i != (byStandIdComlianceResultSize - 1)){ rowIndex ++; } @@ -383,9 +404,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi Row dataRow = sheet.createRow(rowIndex); dataRow.createCell(0).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("dutyTerritory_dicText"))); dataRow.createCell(1).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("projectName"))); - dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designStatus_dicText"))); - dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoStatus_dicText"))); - dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyStatus_dicText"))); + dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designFlowTaskStatus_dicText"))); + dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoFlowTaskStatus_dicText"))); + dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyFlowTaskStatus_dicText"))); rowIndex ++; } } @@ -512,7 +533,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi } if(StringUtils.isNotEmpty(idStr)){ idStr = idStr.substring(0,idStr.length()-1); - conditionSb.append(" and id in("+idStr+")"); + conditionSb.append(" and bdl.id in("+idStr+")"); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 91fbcc37e..525b4f7e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1350,7 +1350,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); @@ -2290,10 +2292,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); @@ -2308,15 +2311,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() - + ". you sumitted has been approved."; + + " you submitted has been approved."; msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + ": You have a design compliance task to complete"; @@ -2334,7 +2338,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); + for (NewOpinionTemplateEO newOpinionTemplateEO : newOpinionTemplateEOList) { + newOpinionTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ @@ -149,6 +153,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); + for (NewStandardTemplateEO newStandardTemplateEO : newStandardTemplateEOList) { + newStandardTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); } @@ -289,6 +296,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); //法规月报id List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); + List userIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); + List userIds = new ArrayList<>(); + for (String s : userIdList) { + if(StringUtils.isNotBlank(s)){ + if(s.contains(",")){ + userIds.addAll(Arrays.asList(s.split(","))); + }else{ + userIds.add(s); + } + } + } + List jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ",")); + List userList = new ArrayList<>(); + for (JSONObject jsonObject : jsonObjects) { + LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class); + userList.add(loginUser); + } + //获取章节目录 List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); @@ -311,6 +336,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() @@ -356,6 +383,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); + if(StringUtils.isNotBlank(lawsContact)){ + List collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); + StringBuilder sb = new StringBuilder(); + for (String s : lawsContact.split(",")) { + List loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); + if(loginUserList.size() != 0){ + sb.append(loginUserList.get(0).getUsername()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + lawsMonthlyReportWriteEO.setLawsContactName(substring); + } + } + } + @Override public void exportMonthlyReport(HttpServletResponse response, HttpServletRequest request, @@ -411,8 +456,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOService.list(); lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> memoriesChapterList.contains(e.getId())).collect(Collectors.toList()); - - String path = uploadpath + "/tempZip"; + long l = System.currentTimeMillis(); + String path = uploadpath + "/tempZip"+l; File fileTemp = new File(path); if (fileTemp.exists()) { fileTemp.delete(); @@ -432,16 +477,34 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl list = new ArrayList<>(); + if(StringUtils.isBlank(lawsMonthlyReportWriteEO.getIds())){ + //导出全部 + list = this.list(); + }else{ + //导出部分 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getId,Arrays.asList(lawsMonthlyReportWriteEO.getIds().split(","))); + list = this.list(lambdaQueryWrapper); + } + for (LawsMonthlyReportWriteEO monthlyReportWriteEO : list) { + monthlyReportWriteEO.setExportState(ExportStateEnum.HAS_BEEN_EXPORT.getValue()); + } + if(list.size() != 0){ + this.updateBatchById(list); + } } @@ -461,10 +524,12 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleOneList = lawsMonthlyReportTitleTemplateEOService.list(wrapper); //蔚来汽车法规月报-202004-主页面-CN //NIO Monthly Report on Automobile Regulations-202004-Main Page-EN - String memoriesChapterCN = path + File.separator +"蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"主页面-CN.docx"; - String memoriesChapterEN = path + File.separator +"NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-Main Page-EN.docx"; - String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx"; - String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; + String memoriesChapterCN = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-主页面-CN.docx"; + String memoriesChapterEN = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-主页面-EN.docx"; +// String memoriesChapterEN = path + File.separator +"NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-Main Page-EN.docx"; + String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx"; + String memoriesChapterContentEn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; +// String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx"; String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth(); String titleEN = "NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 160fafee6..e85f66024 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -2,6 +2,7 @@ package com.jero.modules.report.util; import cn.hutool.core.util.ObjectUtil; import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.entity.NewOpinionTemplateEO; import com.jero.modules.report.entity.NewStandardTemplateEO; @@ -173,7 +174,8 @@ public class WordUtil { XWPFRun run = logo.createRun(); String imgFile = logoFilePath; - InputStream is = new FileInputStream(imgFile); + InputStream is = WordUtil.class.getClassLoader().getResourceAsStream("static/home/weilai.png"); +// InputStream is = new FileInputStream(imgFile); XWPFPicture picture = run.addPicture(is, XWPFDocument.PICTURE_TYPE_PNG, imgFile, Units.toEMU(95), Units.toEMU(35)); String blipID = ""; for(XWPFPictureData picturedata : header.getAllPackagePictures()) { //这段必须有，不然打开的logo图片不显示 @@ -251,6 +253,10 @@ public class WordUtil { paragraph.setAlignment(ParagraphAlignment.CENTER); XWPFRun run = paragraph.createRun(); run.setText("NIO Internal"); + run.setFontSize(18); + run.setFontFamily("Blue Sky Standard Regular"); +// run.setFontFamily("Blue Sky Noto Regular"); + run.setBold(true); CTSectPr sectPr = document.getDocument().getBody().getSectPr(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index d7cb9f67e..3c447ac77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -66,6 +66,9 @@ public class SarFileSplitInfoController extends JeroController deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 401da0f62..aa9bdd61b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -156,4 +156,12 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByTaskId",method = RequestMethod.GET) + Result deleteProcessInstanceByTaskId(@RequestParam("taskId") String taskId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index 707089e60..ae1940c04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -177,4 +177,13 @@ public class WorkFlowFeignClientImpl{ Result stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString()); return Result.OK(stringWrapper.getResult()); } + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + public Result deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 512e14819..f3c8ae460 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -92,7 +92,7 @@ spring: mvc: static-path-pattern: /** resource: - static-locations: classpath:/static/,classpath:/public/,classpath:/home/ + static-locations: classpath:/static/,classpath:/public/,classpath:/home,/classpath:/nationalFlag/ autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png new file mode 100644 index 000000000..2c4a076c2 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png new file mode 100644 index 000000000..c9634bd83 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png new file mode 100644 index 000000000..af12bb40c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png new file mode 100644 index 000000000..06c061beb Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png new file mode 100644 index 000000000..b5031a0b6 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png new file mode 100644 index 000000000..a523fa526 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png new file mode 100644 index 000000000..7ef158e4f Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png new file mode 100644 index 000000000..37cd978e8 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png new file mode 100644 index 000000000..d14615a6c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png new file mode 100644 index 000000000..7119c8dd0 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png new file mode 100644 index 000000000..d3c69746f Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png differ diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 40791fac7..72d278ab7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -211,7 +211,7 @@ module.exports = { DataLogManagementPage: 'Data Log Management Page', VersionNumber: 'Version', DataContent: 'Data Content', - creator: 'Creator', + creator: 'Created By', selectTwoPiecesData: 'Please select two pieces of data', selectSameDatabase: 'Please select the same database table and data ID for comparison', DataComparison: 'Data Comparison', @@ -355,7 +355,7 @@ module.exports = { templateDownload: 'Download Template', textInformation: 'Document Files', relatedInformation: 'Relevant Information', - RetrieveFiles: 'Retrieve Library File', + RetrieveFiles: 'Select Stored File', SplitText: 'Split Library File', ImportResults: 'Import Split Results', copy: 'Copy', @@ -475,7 +475,7 @@ module.exports = { away: 'Collapse', toDoProcess: 'To Do', processDone: 'Completed', - sentProcess: 'Create', + sentProcess: 'Initiated', monitoringProcess: 'Monitor', ConfirmDeployment: 'Confirm Deployment?', terminationProcess: 'Termination Process', @@ -589,7 +589,7 @@ module.exports = { withdraw: 'Withdraw', maintenanceList: 'Maintain', instructionForUse: 'Instruction', - subtitle: 'Sub-Title', + subtitle: 'Sub-title', scopeOfApplication: 'Scope', correspondingStandard: 'Compare EU/CN', implementationCategory: 'Usage', @@ -610,7 +610,7 @@ module.exports = { deliverableTemplate: 'Deliverable Template', entryName: 'Project Name', targetMarket: 'Target Market', - projectStatus: 'Development', + projectStatus: 'Project Status', StudioEngineer: 'R&H Studio', CertificationTime: 'Certification Time', NTplatform: 'NT Platform', @@ -702,7 +702,7 @@ module.exports = { pleaseEnterTheCorrectWebAddress: 'Please enter the correct web address', updateTime: 'Update Time', comment: 'Comment', - historicalVersion: 'Historical Version', + historicalVersion: 'History Version', versionName: 'Version Name', finalizationTime: 'Finalization Time', setting: 'Setting', @@ -1049,24 +1049,24 @@ module.exports = { NNNiONumber: 'Number', NNiONumber: 'NIO Number', ParameterNo: 'Number', - NRequired: 'Is Must', + NRequired: 'Required', NParameterName: 'Para Name', NtechnicalField: 'Tech field', NparameterBatch: 'Params Batch', NareaOfResponsibility: 'Responsible Field', NParameterDescription: 'Description', - NcertificationCategory: 'Cert', - NcontrolType: 'Control Type', - NcontrolVerification: 'Control Verify', - NcontrolAlternatives: 'Control Values', + NcertificationCategory: 'Cert Category', + NcontrolType: 'Control Componet', + NcontrolVerification: 'Validate Componet', + NcontrolAlternatives: 'Componet Value', DefaultValue: 'Default Value', NattachmentTemplate: 'File Template', Ntext: 'Text', - NDropdownradio: 'Pull Single', - NDropdownmultipleselection: 'Pull More', + NDropdownradio: 'Pull single', + NDropdownmultipleselection: 'Pull more', Nenclosure: 'File', - Atext: 'Text+Pull Single', - Btext: 'Text+Pull More', + Atext: 'Text+Pull single', + Btext: 'Text+Pull more', Ctext: 'Text+File', Dtext: 'Pull single+File', Etext: 'Pull more+File', @@ -1115,26 +1115,26 @@ module.exports = { RegulationTaskConfirmationNotification: 'Regulation Task Confirmation Notification', evaluationMethod: 'Evaluation method', uploadRelevantMaterials: 'Upload relevant materials', - processBackground: 'Process background', - selectedStandard: 'Selected standard', + processBackground: 'Process Background', + selectedStandard: 'Selected Standard', standardDecompositionDocument: 'Standard decomposition document', pleaseSelectStandardFirst: 'Please select a standard first', RelevantMaterials: 'RelevantMaterials', - evaluatorFeedback: 'Evaluator feedback', + evaluatorFeedback: 'Evaluator Feedback', nameTechnicalDocument: 'Name of technical document', chapter: 'chapter', - problemDescription: 'Problem description', + problemDescription: 'Problem Description', filingExternalOpinions: 'Filing of external opinions', regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results', initiateProcessForCurrentStandard: 'Initiate process for current standard', engineerFeedbackResults: 'Engineer feedback results', - fileExport: 'File export', - feedbackTime: 'Feedback time', + fileExport: 'File Export', + feedbackTime: 'Feedback Time', regulatoryTechnologyAssessmentProcess: 'Regulatory technology assessment process', - feedbackEvaluation: 'Feedback evaluation', - clauseEvaluation: 'Clause evaluation', - standardDocuments: 'Standard documents', - pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list', + feedbackEvaluation: 'Feedback Evaluation', + clauseEvaluation: 'Clause Evaluation', + standardDocuments: 'Standard Documents', + pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluator in the list', reviewComments: 'Review comments', PleaseCompleteList: 'Please complete the compliance results in the list', sponsorFeedback: 'Sponsor feedback', @@ -1213,7 +1213,7 @@ module.exports = { displayPermission: 'Display permission', authorizedUser: 'Authorized user', problemClassification: 'Problem classification', - market: 'market', + market: 'Market', documentNumber: 'Document Number', documentTitle: 'Document Title', bringInDocumentInformation: 'Bring in document information', @@ -1252,8 +1252,13 @@ module.exports = { optionDropDownBox:'Option drop - down box', attachmentUpload:'file', textInput:'Text Input', - deleteNode:'If any file information exists, it will be deleted', + deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', forward:'Forward', areResponsibilityAreaInformationBatch:'Are you sure you want to modify the responsibility area information in batch', + issuedBy:'Issued by', + pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', + currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', + currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', + weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 29609864d..bdd85ecab 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -495,7 +495,7 @@ module.exports = { toBeConfirmed: '待确认', Operator: '操作人', role: '角色', - operationContent: '操作内容', + OperationContent: '操作内容', operationTime: '操作时间', toDoProcess: '待办流程', processDone: '已办流程', @@ -1139,7 +1139,6 @@ module.exports = { feedbackEvaluation: '反馈评估', clauseEvaluation: '条款评估', standardDocuments: '标准文件', - pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人', reviewComments: '审核意见', PleaseCompleteList: '请补全列表中符合性结果', sponsorFeedback: '发起人反馈', @@ -1240,7 +1239,7 @@ module.exports = { feedbackEvaluation: '反馈评估', clauseEvaluation: '条款评估', standardDocuments: '标准文件', - pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人', + pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估人', reviewComments: '审核意见', PleaseCompleteList: '请补全列表中符合性结果', sponsorFeedback: '发起人反馈', @@ -1355,8 +1354,13 @@ module.exports = { Paraname: '参数名称', Parabatch: '参数批次', freeze:'请选择冻结配置', - deleteNode:'若有文件信息将同步删除', + deleteNode:'若有文件信息将同步删除，确认删除该条数据？', HaveReleased:'已发布', forward:'转发', areResponsibilityAreaInformationBatch:'确实是否批量修改责任领域信息', + issuedBy:'发布人', + pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', + currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', + currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', + weilaiRegulationMonthlyReport:'蔚来法规月报', } \ No newline at end of file diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 21d8893ef..43ea9932a 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -124,7 +124,7 @@ } else { eventBUs.$emit('searchReset') } - this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`) + this.$message.success(this.$t('OperationSuccessful')) } this.spinning = false } else { @@ -187,7 +187,7 @@ } this.spinning = false } else { - this.$message.error(`文件导入失败: ${info.file.msg} `) + this.$message.error(this.$t('operationFailed')) this.spinning = false } } diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue index f58b83b24..0d0fa270d 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -150,14 +150,14 @@ if (res.success) { var jsonHead = res.result this.columns = [] - this.columns.push( - { - title: this.$t('serialNumber'), - dataIndex: 'index', - key: 'index', - align: 'center', - customRender: (text, record, index) => `${index + 1}` - }) + // this.columns.push( + // { + // title: this.$t('serialNumber'), + // dataIndex: 'index', + // key: 'index', + // align: 'center', + // customRender: (text, record, index) => `${index + 1}` + // }) jsonHead.forEach((res, index) => { this.columns.push({ title: res.db_field_txt, diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index ecd48eb3d..a2d883e27 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -40,7 +40,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll="{x: '100%',y:'calc(100vh - 130px)'}" + :scroll="{x: '100%',y:370}" :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 90a5dda09..5d0ad277d 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -712,4 +712,7 @@ /deep/ .ant-calendar-picker{ display: block; } + ::v-deep .ant-modal-body{ + overflow-y: visible!important; + } \ No newline at end of file diff --git a/jero-web/src/components/menu/SideMenu.vue b/jero-web/src/components/menu/SideMenu.vue index adc5a8c3f..72eab609e 100644 --- a/jero-web/src/components/menu/SideMenu.vue +++ b/jero-web/src/components/menu/SideMenu.vue @@ -69,7 +69,7 @@ methods: { onSelect(obj) { this.$emit('menuSelect', obj) - }, + } } } @@ -201,5 +201,14 @@ left: 0 !important; right: inherit !important; } + + + diff --git a/jero-web/src/components/menu/index.js b/jero-web/src/components/menu/index.js index 1b5f3c0fd..6255cfdd4 100644 --- a/jero-web/src/components/menu/index.js +++ b/jero-web/src/components/menu/index.js @@ -109,7 +109,7 @@ export default { props = { to: { path: menu.path } } } - const attrs = { href: menu.path, target: menu.meta.target } + const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title } if (menu.children && menu.alwaysShow) { // 把有子菜单的 并且 父菜单是要隐藏子菜单的 @@ -162,7 +162,7 @@ export default { span slot = 'title' > { this.renderIcon(menu.meta.icon) } - < span > { menu.meta.title } < /span> + < span title={menu.meta.title}> { menu.meta.title } < /span> < /span> { itemArr diff --git a/jero-web/src/components/processForm/index.vue b/jero-web/src/components/processForm/index.vue index 61576bc93..4c6cd5e4b 100644 --- a/jero-web/src/components/processForm/index.vue +++ b/jero-web/src/components/processForm/index.vue @@ -147,12 +147,12 @@ key: 'role', }, { - title: this.$t('operationContent'), + title: this.$t('OperationContent'), dataIndex: 'content', key: 'content', }, { - title: this.$t('operationTime'), + title: this.$t('OperationTime'), dataIndex: 'time', key: 'time', }, diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 7ac897a66..5d0b4c20b 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -168,7 +168,7 @@ }, searchQueryList: { type: Array, - default: ()=>{ + default: () => { return [] } }, @@ -195,7 +195,7 @@ this.queryParam = {} if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') - let endTime = this.getNewDate('after', 6) + let endTime = this.haflYear() this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } @@ -217,68 +217,26 @@ } }) }, - getNewDate(flag, many) { - - const thirtyDays = [4, 6, 9, 11] // 30天的月份 - - const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份 - - const currDate = new Date() // 今天日期 - - const year = currDate.getFullYear() - - let month = currDate.getMonth() + 1 - - let targetDateMilli = 0 - - let GMTDate = '' // 中国标准时间 - - let targetYear = '' // 年 - - let targetMonth = '' // 月 - - let targetDate = '' // 日 - - let dealTargetDays = '' // 目标日期 - - const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年 - - let countDays = 0 // 累计天数 - - for (let i = 0; i < many; i++) { - - if (flag === 'before') { - - month = month - 1 <= 0 ? 12 : month - 1 - - } else { - - month = month + 1 > 12 ? 1 : month + 1 - - } - - thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28) + haflYear() { + // 先获取当前时间 + var curDate = (new Date()).getTime() + // 将半年的时间单位换算成毫秒 + var halfYear = 365 / 2 * 24 * 3600 * 1000 + // 半年前的时间（毫秒单位） + var pastResult = curDate + halfYear + // 日期函数，定义起点为半年前 + var pastDate = new Date(pastResult) + var pastYear = pastDate.getFullYear() + var pastMonth = pastDate.getMonth() + 1 + var pastDay = pastDate.getDate() + if (pastMonth >= 1 && pastMonth <= 9) { + pastMonth = '0' + pastMonth } - - targetDateMilli = currDate.setDate( - currDate.getDate() - (flag === 'before' ? countDays : countDays * -1) - ) - - GMTDate = new Date(targetDateMilli) - - targetYear = GMTDate.getFullYear() - - targetMonth = GMTDate.getMonth() + 1 - - targetDate = GMTDate.getDate() - - targetMonth = targetMonth.toString().padStart(2, '0') - - targetDate = targetDate.toString().padStart(2, '0') - - dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}` - - return dealTargetDays + if (pastDay >= 0 && pastDay <= 9) { + pastDay = '0' + pastDay + } + var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1) + return endDate }, dateChange(item) { this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 8201e8ed5..5d8242925 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -350,13 +350,25 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result) + this.completeTask(value, res.result, true) } else { this.JLoading = false } }) }, - completeTask(value, taskId) { + deleteProcessInstanceByTask(taskId) { + getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { + }) + }, + completeTask(value, taskId, isTrue) { + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + value.handlingTime = handlingTime + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, @@ -375,6 +387,9 @@ } else { this.JLoading = false this.$message.warning(this.$t('operationFailed')) + if (isTrue) { + this.deleteProcessInstanceByTask(taskId) + } } }) } diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 173a0f4e2..949aa6995 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -75,7 +75,7 @@
-
+
{{$t('initiatingProcess')}}
@@ -86,7 +86,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 160px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -232,6 +232,7 @@ searchReset() { this.queryParam = {} this.$route.query.serialNumber = '' + this.$route.query.gatherResult = '' this.pageNo = 1 this.getList() }, @@ -255,6 +256,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', + gatherResult: this.$route.query.gatherResult ? this.$route.query.gatherResult : '', ...queryParam } this.loading = true diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue index b1d02eb16..81b080a51 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -19,7 +19,7 @@
@@ -34,6 +34,7 @@
-
- +
+ - 中国 + {{item.applyMarket_dictText}}
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- -
+
+ +
+ {{$t('dataLoading')}}
@@ -99,13 +71,18 @@ queryParam: {}, conList: [], applyMarketList: [], - pageSize: 10, + pageSize: 12, total: 0, - pageNo: 1 + pageNo: 1, + loading: false, + url: { + getInfoList: '/problemKnowledgeBase/countryCardManageReleaseEO/page' + } } }, mounted() { this.getApplyMarketList() + this.getList() }, methods: { getApplyMarketList() { @@ -118,10 +95,15 @@ }) }, searchQuery() { - + this.pageNo = 1 + this.getApplyMarketList() + this.getList() }, searchReset() { - + this.pageNo = 1 + this.getApplyMarketList() + this.queryParam = {} + this.getList() }, pageOnChange(page, pageSize) { this.pageNo = page @@ -135,14 +117,19 @@ getList() { let query = { pageNo: this.pageNo, - pageSize: this.pageSize + pageSize: this.pageSize, + releaseStatus: 'Have released', + ...this.queryParam } - postAction(this.url.getInfoList, query).then((res) => { + this.loading = true + getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records this.total = res.result.total + this.loading = false } else { this.conList = [] + this.loading = false } }) }, @@ -153,10 +140,13 @@ }) window.open(newUrl.href, '_blank') }, - contentClick() { + contentClick(row) { let newUrl = this.$router.resolve({ path: '/countryCardView', - query: {} + query: { + applyMarket: row.applyMarket, + id: row.id + } }) window.open(newUrl.href, '_blank') } @@ -208,6 +198,7 @@ .content-box { width: 100%; + overflow: hidden; } .content-box-box { @@ -226,14 +217,14 @@ } .content-box-box-img { - width: 70%; + width: 238px; height: 100%; border-right: 1px #d9d9d9 solid; } .content-box-box-text { + width: calc(100% - 238px); display: inline-block; - width: 30%; text-align: center; font-size: 18px; font-weight: 500; @@ -244,6 +235,7 @@ width: 100%; text-align: right; margin-top: 20px; + margin-bottom: 20px; } .operator-text { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 9e34a7f28..367fa4314 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -19,10 +19,18 @@
{{$t('applicableMarket')}}
- + + + + {{ item.title}} + + + @@ -150,6 +158,7 @@ deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch' }, userInfoQuery: {}, + applyMarketList: [], selectedRowKeys: [], columns: [ { @@ -177,10 +186,20 @@ mounted() { document.title = 'Country Card-' + this.$t('managePublishing') this.getList() + this.getApplyMarketList() this.userInfoQuery = this.userInfo() }, methods: { ...mapGetters(['userInfo']), + getApplyMarketList() { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '1' }).then((res) => { + if (res.success) { + this.applyMarketList = res.result || [] + } else { + this.applyMarketList = [] + } + }) + }, searchQuery() { this.pageNo = 1 this.getList() @@ -200,6 +219,7 @@ this.getList() }, countryCardReleaseAddForm() { + this.getApplyMarketList() this.pageNo = 1 this.getList() }, @@ -256,6 +276,7 @@ _this.$message.success(_this.$t('OperationSuccessful')) _this.selectedRowKeys = [] _this.getList() + _this.getApplyMarketList() } else { _this.$message.warning(res.message) } @@ -298,10 +319,13 @@ } }) }, - viewClick() { + viewClick(row) { let newUrl = this.$router.resolve({ path: '/countryCardView', - query: {} + query: { + applyMarket: row.applyMarket, + id: row.id + } }) window.open(newUrl.href, '_blank') }, @@ -314,6 +338,7 @@ if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() + _this.getApplyMarketList() } else { _this.$message.warning(res.message) } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index a2ed72151..322962110 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -62,7 +62,8 @@ { content.push({ - countryCardTempId: res.id, + countryCardTempId: res.countryCardTempId, description: res.description, content: res.content, id: res.id diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue index ef66a9780..54bc7a3cd 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue @@ -21,7 +21,7 @@ @@ -77,6 +77,8 @@ @@ -94,7 +96,7 @@ @@ -111,7 +113,7 @@ + v-model.trim="formInline.description" :rows="4"/> @@ -190,8 +192,8 @@ ], description: [ { - max: 300, - message: this.$t('describe') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 500, + message: this.$t('describe') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ] diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 65273ad93..4c91a6b97 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -6,7 +6,7 @@ - {{$t('See')}} + {{header_text}}
@@ -23,19 +23,50 @@
-
-
-
- - - 中国 - +
+
+
+ + + + + {{item2.applyMarket_dictText}} + +
- - - 中国 - + {{item2.lableName}} + + {{$t('viewFile')}} + + + {{item2.lableName}} + + + {{item2.lableName}} + + + + + +
@@ -44,8 +75,11 @@
- + + {{$t('dataLoading')}} +
@@ -53,35 +87,172 @@ import { getAction, postAction, downloadFile } from '@/api/manage' import displayInformationModel from './displayInformationModel' import countryCardViewAdd from './countryCardViewAdd' + import viewFileModel from '@/components/viewFileModel/index' export default { name: 'countryCardView', components: { displayInformationModel, - countryCardViewAdd + countryCardViewAdd, + viewFileModel }, data() { return { clientWidth: '', - isTrue: false + isTrue: false, + loading: false, + dataList: [], + contentList: [], + displayList: [], + queryCountryList: [], + countryCardViewList: [], + applyMarkets: '', + header_text: '', + url: { + list: '/problemKnowledgeBase/countryCardTempEO/list', + deleteOne: '' + }, + list: '/problemKnowledgeBase/countryCardManageReleaseEO/queryCountryCardManageReleaseByApplyMarkets' } }, mounted() { - this.isTrue = false - this.$nextTick(() => { - this.clientWidth = 340 * 14 + 'px' - this.isTrue = true + this.queryCountry(() => { + this.replacePage() }) }, methods: { displayInformationClick() { - this.$refs.displayInformationModelRef.getData() + this.$refs.displayInformationModelRef.getData(JSON.parse(JSON.stringify(this.displayList))) + }, + displayInformationModelForm(data) { + this.displayList = data + this.displayList = [...this.displayList] + this.consolidateData() }, newlyAddedClick() { - this.$refs.countryCardViewAddRef.add() + this.$refs.countryCardViewAddRef.add(this.countryCardViewList) }, - countryCardViewAddForm() { - + countryCardViewAddForm(val) { + this.countryCardViewList = JSON.parse(JSON.stringify(val)) + let content = [] + if (val && val.length > 0) { + val.forEach(res => { + if (res.applyMarket) { + content.push(res.applyMarket) + } + }) + } + this.applyMarkets = content.join(',') + this.queryCountry() + }, + replacePage() { + getAction(this.url.list, {}).then((res) => { + if (res.success) { + this.displayList = res.result || [] + this.displayList.forEach(val => { + val.showOrNot = true + }) + this.$nextTick(() => { + this.$refs.displayInformationModelRef.dataListOne = JSON.parse(JSON.stringify(this.displayList)) + }) + this.consolidateData() + this.loading = false + } else { + this.displayList = [] + this.loading = false + } + }) + }, + consolidateData() { + let content = [] + this.contentList = [] + this.contentList.push({}) + if (this.displayList && this.displayList.length > 0) { + this.displayList.forEach(res => { + if (res.showOrNot) { + content.push(res) + } + }) + } + if (this.queryCountryList && this.queryCountryList.length > 0) { + this.contentList[0].list = [] + this.contentList[0].list.push({}) + this.queryCountryList.forEach(val => { + this.contentList[0].name = 'tou' + this.contentList[0].list.push({ + applyMarket_dictText: val.applyMarket_dictText, + img: val.countryNationalFlag + }) + }) + } + if (content && content.length > 0) { + console.log(content) + content.forEach((res, index) => { + this.contentList[index + 1] = { name: res.lableName } + this.contentList[index + 1].list = [] + this.contentList[index + 1].list.push({ + lableName: res.lableName, + lableType: res.lableType, + relevantUrl: res.relevantUrl + }) + }) + } + this.queryCountryList.forEach((res, index) => { + res.countryCardManageReleaseDetailEOList.forEach((val, index1) => { + this.contentList.forEach(res1 => { + if (res1.name == val.lableName) { + if (val.lableType == 3) { + res1.list.push({ + lableName: val.contentDropDownValue, + lableType: val.lableType + }) + } else { + res1.list.push({ + lableName: val.content, + lableType: val.lableType + }) + } + } + }) + }) + }) + }, + queryCountry(callback) { + this.loading = true + let applyMarkets = this.$route.query.applyMarket + if (this.applyMarkets) { + applyMarkets = applyMarkets + ',' + this.applyMarkets + } + let query = { + applyMarkets: applyMarkets + } + postAction(this.list, query).then((res) => { + if (res.success) { + this.queryCountryList = res.result || [] + this.isTrue = false + this.$nextTick(() => { + this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' + this.isTrue = true + }) + let content = [] + this.queryCountryList.forEach(val => { + content.push(val.applyMarket_dictText) + }) + this.header_text = content.join('-') + callback && callback() + if (!callback) { + this.consolidateData() + this.loading = false + } + } else { + callback && callback() + this.contentList = [] + this.loading = false + } + }) + }, + viewFileClick(item) { + this.$refs.viewFileModelRef.clickButtonToUpload(item) } } } @@ -201,6 +372,8 @@ width: 340px; display: inline-block; height: 80px; + line-height: 80px; + text-align: center; background: #fff; border-right: 1px #d9d9d9 solid; border-bottom: 1px #d9d9d9 solid; @@ -232,10 +405,28 @@ background: #fff; } + .content-box-top { + height: 80px; + } + .content-box-top:first-child { position: sticky; top: 0; + height: 160px; z-index: 111; background: #fff; } + + .content-box-box-text-index { + width: 100% !important; + padding: 0 12px; + box-sizing: border-box; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .content-box-box-text-admin { + height: 80px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue index da74db64a..39181fe65 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue @@ -14,14 +14,15 @@
- * {{$t('applicableMarket')}}
- +
@@ -30,19 +31,27 @@
- * {{$t('comparisonMarket')+(index+1)}}
- + + + + {{ item.applyMarket_dictText}} + + + { this.formInline = {} - this.formInline.dataList = [{ - relatedSection: '' - }] + this.formInline.applyMarket = this.$route.query.applyMarket + if (data && data.length > 0) { + this.formInline.dataList = JSON.parse(JSON.stringify(data)) + } else { + this.formInline.dataList = [{ + applyMarket: '' + }] + } + this.getList() this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() }) @@ -113,29 +133,77 @@ this.formInline = { ...this.formInline } }, handleOk() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - - } - }) + this.$emit('countryCardViewAddForm', JSON.parse(JSON.stringify(this.formInline.dataList))) + this.visible = false }, handleCancel() { this.visible = false }, addData() { this.formInline.dataList.push({ - relatedSection: '' + applyMarket: '' }) + this.consolidateData() this.formInline = { ...this.formInline } }, deleteData() { this.formInline.dataList.pop() + this.consolidateData() this.formInline = { ...this.formInline } + }, + getList() { + let query = { + releaseStatus: 'Have released' + } + getAction(this.url.getInfoList, query).then((res) => { + if (res.success) { + this.applyMarketList = res.result + this.consolidateData() + } else { + this.applyMarketList = [] + } + }) + }, + consolidateData() { + let content = [] + content.push(this.$route.query.applyMarket) + content = content.join(',') + this.applyMarketList = this.applyMarketList.filter(res => { + return !content.includes(res.applyMarket) + }) + let contentIndex = [] + if (this.formInline.dataList && this.formInline.dataList.length > 0) { + this.formInline.dataList.forEach(res => { + contentIndex.push(res.applyMarket) + res.applyMarketList = [] + this.applyMarketList.forEach(val => { + res.applyMarketList.push(val) + }) + }) + } + contentIndex = contentIndex.join(',') + for (let i = 0; i < this.formInline.dataList.length; i++) { + for (let j = 0; j < this.formInline.dataList[i].applyMarketList.length; j++) { + if (contentIndex.includes(this.formInline.dataList[i].applyMarketList[j].applyMarket) + && this.formInline.dataList[i].applyMarket != this.formInline.dataList[i].applyMarketList[j].applyMarket) { + this.formInline.dataList[i].applyMarketList.splice(j, 1) + j-- + } + } + } + this.formInline = { ...this.formInline } + }, + applyMarketChange() { + this.consolidateData() } } } - + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 8b17b5343..47b816081 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -59,7 +59,7 @@
@@ -92,12 +92,11 @@ {{$t('market')}}
- + @@ -110,6 +109,7 @@ @@ -133,11 +133,13 @@
{{$t('content')}}
- + @@ -239,6 +241,13 @@ message: this.$t('market') + this.$t('cannotEmpty'), trigger: 'change' } + ], + content: [ + { + max: 5000, + message: this.$t('content') + this.$t('cannotExceed') + 5000 + this.$t('Characters'), + trigger: 'blur' + } ] }, url: { @@ -276,6 +285,9 @@ } }, methods: { + quilleditorBlur() { + this.$refs.ruleForm.validateField('content') + }, getBase() { getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { if (res.success) { @@ -340,7 +352,6 @@ } , onEditorChange({ quill, html, text }) { - console.log('editor change!', quill, html, text) this.formInline.content = html } , @@ -562,6 +573,7 @@ .box-button { height: 38px; + margin-top: 4px; } .submit-button { @@ -572,4 +584,10 @@ box-sizing: border-box; } + ::v-deep .itemModel-explain .ant-form-explain { + margin-top: 60px + } + ::v-deep .ql-tooltip { + z-index: 10 !important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 8c2c3ff7c..2b3175a5f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -1,25 +1,29 @@ @@ -90,9 +96,12 @@ searchContent: '', checkboxText: [], conList: [], + searchStr: '', total: 0, + selectedTags: [], loading: false, pageSize: 10, + tagList: [], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, url: { @@ -102,14 +111,36 @@ }, mounted() { this.getList() + this.replacePage() }, methods: { + replacePage() { + getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { + if (res.success) { + this.tagList = res.result + } else { + this.tagList = [] + } + }) + }, + classificationMaintenanceModelForm() { + this.replacePage() + }, onSearch() { this.pageNo = 1 this.getList() }, + handleChange(tag, checked) { + const { selectedTags } = this + const nextSelectedTags = checked + ? [...selectedTags, tag] + : selectedTags.filter(t => t !== tag) + this.selectedTags = nextSelectedTags + this.getList() + }, ResetSearch() { this.searchStr = '' + this.selectedTags = [] this.pageNo = 1 this.getList() }, @@ -127,11 +158,6 @@ this.$router.push({ path: '/problemKnowledgeBaseAdd' }) - // let newUrl = this.$router.resolve({ - // path: '/problemKnowledgeBaseAdd', - // query: {} - // }) - // window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page @@ -142,16 +168,29 @@ this.pageSize = pageSize this.getList() }, + getText(str) { + let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 + return words.replace(/\s/g, '') //这里是去除空格 + }, getList() { + let selectedTags = JSON.parse(JSON.stringify(this.selectedTags)) let query = { pageNo: this.pageNo, pageSize: this.pageSize, - searchStr: this.searchStr + searchStr: this.searchStr, + problemTypes: selectedTags.join(',') } this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records + if (this.conList && this.conList.length > 0) { + this.conList.forEach(val => { + if (val.content) { + val.contentOne = this.getText(val.content) + } + }) + } this.total = res.result.total this.loading = false } else { @@ -308,6 +347,8 @@ font-weight: 400; color: #040B29; opacity: 0.7; + white-space: pre-wrap; + word-wrap: break-word; } .page { @@ -320,4 +361,31 @@ text-align: center; line-height: 10; } + + ::v-deep .ant-tag { + padding: 2px 4px; + background: #9B9DA9; + color: #fff!important; + } + ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover{ + color: #fff!important; + } + ::v-deep .ant-tag-checkable-checked{ + background: #21c9cc; + } + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 0a170f8d7..d325f194d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -3,7 +3,7 @@
- + {{$t('managePublishing')}} @@ -12,17 +12,19 @@
-
-
- {{$t('searchContent')}} + +
+
+ {{$t('searchContent')}} +
+ + {{$t('query')}} + {{$t('reset')}}
- - {{$t('query')}} - {{$t('reset')}} -
+
-
+
@@ -36,7 +38,8 @@
-
+
+ {{item.contentOne}}
{{$t('edit')}} @@ -46,26 +49,26 @@
-
- 暂无数据 -
-
- -
+
+ {{$t('noData')}} +
+
+
- {{$t('dataLoading')}}
+ {{$t('dataLoading')}}
+