diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index e09c41e5a..6e33bcb04 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 @@ -869,3 +866,50 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti 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, '/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'; + +-- 表字段 英文修改 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'; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index a14d95991..6c249ec1e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -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!"); } } } @@ -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!"); } } } @@ -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/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/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..2623a233d 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 @@ -64,8 +64,9 @@ public class SarFileCompareInfoController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); 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.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.PUBLISHED.getValue()); + queryWrapper.orderByAsc("create_by"); + 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..f0d77ba71 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()); + // 处理文档库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> 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 aa6ea910a..baee6ebaa 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,14 +217,12 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryTreeList() { try { List list = queryList(); - List res = getSubFolder(superFolder, list, 1); + List res = getSubFolder(superFolder, list, 1, true); Collections.sort(res); return res; } catch (Exception ex) { @@ -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, boolean needAuth) { + 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 (!needAuth || 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, false)); + date.sortChildren(); + resList.add(date); + } else { + resList.addAll(getSubFolder(erf.getId(), list, childLevel, true)); + } } } 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 +422,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 +521,13 @@ 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 { @@ -471,7 +535,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/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 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/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 `${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/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/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/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index c2042a3c1..929c4f38c 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -361,6 +361,8 @@ }) }, completeTask(value, taskId, isTrue) { + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + value.operatorTime = handlingTime Object.keys(value).forEach(res => { if (value[res] && value[res] instanceof String) { value[res] = value[res].replace(/\"/g, '“') diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 173a0f4e2..0a13a4202 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -255,6 +255,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/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 301721aff..5ba9e0e3c 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 @@ { this.contentList.forEach(res1 => { if (res1.name == val.lableName) { - res1.list.push({ - lableName: val.content, - lableType: val.lableType - }) + if (val.lableType == 3) { + res1.list.push({ + lableName: val.contentDropDownValue, + lableType: val.lableType + }) + } else { + res1.list.push({ + lableName: val.content, + lableType: val.lableType + }) + } } }) }) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 4b5d678f1..c954fe235 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -133,8 +133,9 @@
{{$t('content')}}
- + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 04c9f615a..587a41d0c 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -109,12 +109,14 @@ title: this.$t('chapterContents'), align: 'center', dataIndex: 'memoriesChapterName', + ellipsis: true, width: 170 }, { title: this.$t('chineseTitle'), align: 'center', dataIndex: 'titleCn', + ellipsis: true, width: 170 }, { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index d091d3d9b..ace3619da 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -391,8 +391,8 @@ this.formInline = { ...this.formInline } } else { this.formInline = {} - this.formInline.lawsContact = this.userInfo().username - this.formInline.lawsContactName = this.userInfo().id + this.formInline.lawsContact = this.userInfo().id + this.formInline.lawsContactName = this.userInfo().username this.formInline = { ...this.formInline } } }) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index ca2803ca7..3f9010c48 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -384,4 +384,21 @@ height: 38px; margin-top: 4px; } + + ::v-deep .ant-select-tree-treenode-switcher-close { + width: 255px; + } + + ::v-deep .ant-select-tree-node-content-wrapper { + float: right; + margin-top: -2px!important; + } + + ::v-deep .ant-select-tree-title { + width: 100%; + display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index df745bf88..3a8d0b8d0 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -84,12 +84,13 @@ title: this.$t('chineseTitle'), align: 'center', dataIndex: 'titleCn', - width: 210 + ellipsis: true, + width: 320 }, { title: this.$t('englishTitle'), align: 'center', - width: 210, + width: 320, ellipsis: true, dataIndex: 'titleEn' }, @@ -162,7 +163,11 @@ this.sortList.push(this.dataSource[index - 1]) } } - this.move() + if (this.sortList.length > 1) { + this.move() + } else { + this.$message.warning(this.$t('currentlyTheFirstOneThatCannotMovedUp')) + } }, moveDownClick(row, index) { this.sortList = [] @@ -179,7 +184,11 @@ this.sortList.push(this.dataSource[index + 1]) } } - this.move() + if (this.sortList.length > 1) { + this.move() + } else { + this.$message.warning(this.$t('currentlyTheLastOneCannotmovedDown')) + } }, move() { postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 9e8fec8bc..1ea9fa210 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -164,16 +164,22 @@ }, submitData(callback) { let dataList = JSON.parse(JSON.stringify(this.dataList)) - for (let i = 0; i < dataList.length; i++) { - if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) { - dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') - } - dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID - if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) { - this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator')) - return + if (dataList && dataList.length > 0) { + for (let i = 0; i < dataList.length; i++) { + if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) { + dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') + } + dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID + if (!dataList[i].evaluatorIds) { + this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator')) + return + } } + } else { + this.$message.warning(this.$t('pleaseDecompositionStandardOrder')) + return } + callback && callback(dataList) }, handleModule() { @@ -202,4 +208,23 @@ text-justify: inter-ideograph; word-break: break-all } + + ::v-deep .ant-select-tree-treenode-switcher-close { + width: 255px; + } + + ::v-deep .ant-select-tree-node-content-wrapper { + text-align: left; + float: right; + margin-top: -2px !important; + } + + ::v-deep .ant-select-tree-title { + width: 100%; + display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 1ef583d29..583c1df2a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -64,6 +64,7 @@ @@ -114,7 +114,6 @@ @@ -257,6 +256,7 @@ }, searchParmes: {}, selectedRowKeysRecord: [], + standardList: [], whetherDisplay: false, columns: [ { @@ -347,6 +347,9 @@ } }) }, + disabledDate(current) { + return current && current < moment().subtract(1, 'day') + }, pageOnChange(page) { this.pageNo = page this.getList() @@ -432,15 +435,21 @@ }, standardDecompositionDocumentClick() { if (this.standardDecomposition && this.standardDecomposition.length > 0) { - this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0]))) + this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])), this.standardList) } else { this.$message.warning(this.$t('pleaseSelectStandardFirst')) } }, standardDecompositionSheetForm(value) { + this.standardList = JSON.parse(JSON.stringify(value)) this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value))) }, TermInformationRefForm(value) { + if (value && value.itemId) { + this.standardList = this.standardList.filter(res => { + return value.itemId != res.id + }) + } this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value))) }, clickButtonToUpload(item) { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index 6394fc303..9b09465bb 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -49,7 +49,7 @@ 0) { + this.standardList.forEach(val => { + this.selectedRowKeys.push(JSON.stringify(val)) + }) + this.selectedRowKeysData = this.standardList + } this.total = 0 this.dataList = [] this.standData = row @@ -169,15 +179,16 @@ this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : '' this.visible = true if (this.queryParam.info_id) { + this.pageNo = 1 this.replacePage() } }, getRowList(value) { if (value && value.itemId) { - this.selectedRowKeys = this.selectedRowKeys.filter(res=>{ - return value.itemId != res + this.selectedRowKeys = this.selectedRowKeys.filter(res => { + return !res.includes(value.itemId) }) - this.selectedRowKeysData = this.selectedRowKeysData.filter(res=>{ + this.selectedRowKeysData = this.selectedRowKeysData.filter(res => { return value.itemId != res.id }) } @@ -232,15 +243,23 @@ }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData) + this.$emit('standardDecompositionSheetForm', JSON.parse(JSON.stringify(this.selectedRowKeysData))) this.visible = false } else { this.$message.warning(this.$t('PleaseSelectData')) } }, onSelectChange(value, record) { + console.log(value) + this.selectedRowKeysData = [] this.selectedRowKeys = value - this.selectedRowKeysData = record + console.log(this.selectedRowKeys) + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.selectedRowKeys.forEach(res => { + this.selectedRowKeysData.push(JSON.parse(res)) + }) + } + // this.selectedRowKeysData = record } } } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index c47a86d66..c2c5935ac 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -324,6 +324,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', + flowStatus: this.$route.query.flowStatus ? this.$route.query.flowStatus : '', ...queryParam } this.loading = true diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 637435a0d..2ee3cfc6c 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -88,6 +88,7 @@ prcClick(row) { // let index = row.taskIds.lastIndexOf(',') // row.taskIds = row.taskIds.slice(0, index) + row.router = this.$route.path if (row.prcType == '1') { let newUrl = this.$router.resolve({ path: '/handshakeProcess', @@ -100,7 +101,7 @@ query: row }) window.open(newUrl.href, '_blank') - }else if (row.prcType == '6') { + } else if (row.prcType == '6') { let newUrl = this.$router.resolve({ path: '/evaluationProcess', query: row diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index 00e59eb5d..f25f17751 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -122,6 +122,11 @@ required: true, message: this.$t('publishComment') + this.$t('cannotEmpty'), trigger: 'blur' + }, + { + max: 500, + message: this.$t('publishComment') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' } ], replyContent: [ @@ -129,6 +134,11 @@ required: true, message: this.$t('replyToComments') + this.$t('cannotEmpty'), trigger: 'blur' + }, + { + max: 500, + message: this.$t('replyToComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' } ] } @@ -286,6 +296,7 @@ display: inline-block; margin-top: 22px; margin-left: 40px; + word-break: break-word; } .title-text { @@ -385,10 +396,18 @@ } .button-text { - width: 73px; + width: 88px; overflow: hidden; padding: 0 8px; - box-sizing: border-box; + float: right; + } + + ::v-deep .button-text span { + width: 64px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-top: 4px; } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 971c3c12e..dfe2eeb53 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -30,7 +30,7 @@
-
+
{{this.resultData.serialNumberLeft}}  {{this.resultData.fileNameLeft}}
@@ -56,14 +56,15 @@
- + {{this.resultData.serialNumberRight}}  {{this.resultData.fileNameRight}} - - - - + + + +
{{$t('standard')}}
- +
@@ -29,8 +29,8 @@
{{$t('title')}}
- +
@@ -67,7 +67,7 @@ />
- + {{$t('selectedStandard')}} {{$t('standard')}}
- +
@@ -93,8 +93,8 @@
{{$t('title')}}
- + @@ -131,7 +131,7 @@ />
- + {{$t('selectedStandard')}} {{$t('delete')}} + + {{text}} + + + {{text}} + + + {{text}} + + + {{text}} +