Commit Graph
2101 Commits
Author SHA1 Message Date
zhn 317f8cf2f2 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-24 20:06:47 +08:00
zhn 9a8508951a 搜索中心修改 2022-08-24 20:06:06 +08:00
肖文钰 431c007110 Merge branch 'master' into 'dev_third_stage'
# Conflicts:
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/views/projectManagement/components/listOfRegulations.vue
2022-08-24 20:05:13 +08:00
wangzhijiang 4e64516c82 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-24 19:35:09 +08:00
wangzhijiang c701343948 注释问题知识库向es插入数据。 2022-08-24 19:34:38 +08:00
liyawei 5831e4e320 搜索中心-法规月报-暂时注释掉 2022-08-24 18:11:48 +08:00
liyawei be27e72dc7 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-24 17:06:56 +08:00
liyawei a905e773fc 搜索中心-法规月报-bug58586 2022-08-24 17:05:34 +08:00
wangzhijiang ec3f4204e1 58577 2022-08-24 16:52:05 +08:00
wangzhijiang 69eb85eccc 58555 搜索中心,全部索引、问题知识库索引数据按照创建时间倒序排序。 2022-08-24 16:39:10 +08:00
wangzhijiang 3342aea1f4 update 2022-08-24 16:28:46 +08:00
wangzhijiang f2f985e7a8 58586 2022-08-24 15:44:53 +08:00
wangzhijiang d08fd4c27f 搜索中心-全部索引,增加问题知识库检索加权限。与问题知识库权限一样。 2022-08-24 15:23:56 +08:00
zhn 27d8ea82d4 添加枚举 2022-08-24 15:17:40 +08:00
liyawei f93c150dd0 项目库-项目详情-参数收集统计-bug58668 2022-08-24 14:02:58 +08:00
liyawei 34aa0e1412 认证-参数导出模板-上传文件限制修改 2022-08-24 11:49:22 +08:00
肖文钰 3fa5e31e2a Merge branch 'master' into 'fix_bug_first_stage'
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
2022-08-24 10:15:59 +08:00
liyawei ffdc017db5 搜索中心-法规月报-bug58552,58591 2022-08-24 09:34:47 +08:00
liyawei 8df5807a0b 搜索中心-法规月报-bug58587,58589 2022-08-23 18:28:16 +08:00
wangzhijiang 999c356a61 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-23 18:16:09 +08:00
wangzhijiang b71ca5aad4 搜索中心-问题知识库检索加权限。与问题知识库权限一样。 2022-08-23 18:15:47 +08:00
liyawei de53164a56 文档拆分-表头排序 2022-08-23 15:01:56 +08:00
wangzhijiang 1a0c6e1ad6 搜索中心-问题知识库插入数据逻辑修改。私密的数据也插入es 2022-08-23 14:06:56 +08:00
zhn 0b34c20510 法规清单--调取虚拟清单时,如果责任领域为多个的话,拆分为多条 2022-08-23 13:39:46 +08:00
zhn a001f8e65f 法规清单--更新log去掉编辑,复制,批量设置信息 2022-08-23 11:41:27 +08:00
liyawei 9595a3ccfd 认证管理-表头排序 2022-08-23 11:36:06 +08:00
liyawei 156da08219 项目库-任务清单-批量设置认证进度和状态-校验修改 2022-08-23 11:28:47 +08:00
wangzhijiang 35efbcea00 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-23 10:10:59 +08:00
wangzhijiang f73f3efbcb 清空es接口,增加法规月报、问题知识库索引。 2022-08-23 10:10:37 +08:00
liyawei abd77b852e 项目库-任务清单-批量设置认证进度和状态-校验修改 2022-08-23 09:49:44 +08:00
gaosong e9a74c4025 修改法规清单-导入检查重复编号问题 2022-08-23 02:08:33 +08:00
gaosong 3e6213ee94 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-23 01:57:06 +08:00
gaosong e91af998ec 修改文档对比-导出格式 2022-08-23 01:56:47 +08:00
liyawei d285aa91c7 项目库-任务清单-批量设置认证进度和状态 2022-08-22 18:17:45 +08:00
zhn ff23302f07 修改法规清单和虚拟清单编号长度 2022-08-22 18:09:47 +08:00
liyawei 9b45616dc8 认证-参数项收集-修改表头接口 2022-08-22 18:03:01 +08:00
wangzhijiang e9443a1f94 58461 点击变更不清空三个符合性流程的截止时间。 2022-08-22 17:57:42 +08:00
zhn 784cd1bf7f 法规清单--子标题限制300字符 2022-08-22 17:28:39 +08:00
liyawei d3ee1a637b 项目库-任务清单-批量设置认证进度和状态 2022-08-22 17:24:31 +08:00
wangzhijiang 8cde7284d8 法规清单-带入相关人员- 最新带入逻辑修改。 2022-08-22 17:19:43 +08:00
liyawei 1580c1f168 项目库-任务清单-批量设置认证进度和状态 2022-08-22 17:18:22 +08:00
liyawei 8fc2f8a22a 认证-参数项收集-修改表头接口 2022-08-22 16:14:41 +08:00
wangzhijiang 0926cb5de1 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-22 14:40:50 +08:00
wangzhijiang 55c235efa0 飞书交互-发送问题知识库分类负责人名片。 2022-08-22 14:40:29 +08:00
xiaowenyu 7f17f41351 修改sql文件,标注已同步正式环境 2022-08-22 12:35:29 +08:00
wangzhijiang 51930fc5b1 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-08-22 11:29:59 +08:00
wangzhijiang b29770e58a 问题知识库,结合搜索中心代码放开。 2022-08-22 11:28:44 +08:00
wangzhijiang b0ac1bb287 搜索中心-插入问题知识库代码放开。 2022-08-22 09:21:21 +08:00
liyawei fd76418d50 搜索中心-法规月报-解开注释 2022-08-22 09:09:45 +08:00
zer0Black c081d7dec1 Merge branch 'fix_bug_first_stage'
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
2022-08-19 20:30:44 +08:00