Commit Graph
577 Commits
Author SHA1 Message Date
yuezhihang 6d43442da5 未符合项目排序问题 2022-03-15 16:30:43 +08:00
庄新伟 1379ab889e Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-15 13:31:40 +08:00
庄新伟 f9f4c0c0b4 标准预警导出 2022-03-15 13:31:28 +08:00
yuezhihang 76c7769625 国内,当实施日期大于发布日期时,要在首页的标准发布显示,目前实施日期为单个日期时,没问题,当实施日期为多个且都大于发布日期时,应该也在首页的标准发布显示,目前不显示 2022-03-15 10:01:05 +08:00
yuezhihang fd1cbe8a79 海外-查看-更新消息,清单由是改为否的时候,清单记录的2 2022-03-14 17:08:23 +08:00
yuezhihang bbe8114507 首页-标准发布,把文本状态为即将实施的逻辑去掉,只遵循标准发布大于系统日期小于实施日期,才能在首页显示 2022-03-14 14:17:14 +08:00
庄新伟 af846f74e0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-14 09:30:10 +08:00
庄新伟 bae566fd1f 工作组导入导出 2022-03-14 09:29:55 +08:00
yuezhihang 0d4bc28382 3-11 bug 修复 2022-03-11 18:10:27 +08:00
yuezhihang 2d95a7c31f bug修复 2022-03-11 11:29:59 +08:00
super_liu 230e035424 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 跑跑跑 跑数据 重置es

See merge request LiuChao/foton-slrs-system-rest!414
2022-03-08 16:36:54 +08:00
super_liu c1eeea3f1f feat: There is no way the, 跑跑跑 跑数据 重置es 2022-03-08 16:33:33 +08:00
庄新伟 e43c86e894 工作组导入导出 2022-03-08 16:24:05 +08:00
super_liu 73c31e34b2 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!411
2022-03-07 17:34:18 +08:00
super_liu d44a2b6bf0 feat: There is no way the, 重置ES 2022-03-07 15:16:47 +08:00
yuezhihang de50ae5d55 项目清单!!!!!!! 2022-03-04 15:22:40 +08:00
yuezhihang 152c49ce02 项目清单 查询修改 2022-03-04 10:46:20 +08:00
yuezhihang 230d0eab32 项目合规评估 --- 查询条件 新增 2022-03-02 16:52:31 +08:00
yuezhihang 5316e6aeb3 282 bug 修复 2022-02-28 16:08:40 +08:00
yuezhihang 7262b6974b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-24 17:55:28 +08:00
yuezhihang af11a626df bug修复 2022-02-24 17:55:22 +08:00
super_liu fea30dc871 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, tree async

See merge request LiuChao/foton-slrs-system-rest!405
2022-02-22 17:21:21 +08:00
super_liu 183ba86528 feat: There is no way the, tree async 2022-02-22 17:18:18 +08:00
super_liu 8fa99c5b30 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss tree auth

See merge request LiuChao/foton-slrs-system-rest!404
2022-02-21 17:48:33 +08:00
super_liu 5352684945 feat: There is no way the, buss tree auth 2022-02-21 17:44:29 +08:00
yuezhihang c705648e3f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-21 16:43:35 +08:00
yuezhihang 41dbca2772 项目合规评估 入库 操作 2022-02-21 16:43:29 +08:00
super_liu 099df97db4 feat: There is no way the, tree 2022-02-21 12:26:24 +08:00
yuezhihang 697f5722eb 日志模块 查询对象修改 2022-02-18 16:52:21 +08:00
yuezhihang 83ae8a029a 根据角色 查询用户 2022-02-18 16:50:04 +08:00
yuezhihang 278985f338 标准合规评估查询条件 精确变模糊 2022-02-17 19:01:48 +08:00
yuezhihang 03e4f956d1 操作日志日期倒序 2022-02-17 17:14:25 +08:00
2510220824 a6cee426de update:操作日志查询、新增接口 2022-02-17 14:15:36 +08:00
yuezhihang 5206fe004b 接口上加注解EpcLog 并加备注 可存储操作日志 2022-02-16 16:07:40 +08:00
super_liu 658058a84f Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!399
2022-02-11 17:16:20 +08:00
super_liu 012df3992a feat: There is no way the, 2022-02-10 20:40:41 +08:00
super_liu 6a56242ee4 feat: There is no way the, 2022-02-08 20:06:43 +08:00
yuezhihang e9ddea77da Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-27 09:34:43 +08:00
zhaokaiyao@91isoft.com 4379ede739 标准新增以及编辑时 代替标准号在我的收藏中时,此标准也将插入我的收藏 2022-01-26 23:02:32 +08:00
yuezhihang bd2b70930f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-26 20:38:02 +08:00
yuezhihang b1ecd09547 分解单查询接口 标准评估流程用 2022-01-26 20:37:55 +08:00
super_liu dc559482ac Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss state scheduled

See merge request LiuChao/foton-slrs-system-rest!392
2022-01-25 20:11:08 +08:00
super_liu ccaf7d5b86 feat: There is no way the, buss state scheduled 2022-01-25 18:42:46 +08:00
super_liu b992c47c94 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss state

See merge request LiuChao/foton-slrs-system-rest!391
2022-01-24 20:08:42 +08:00
super_liu 01a0a31d15 feat: There is no way the, buss state 2022-01-24 20:00:01 +08:00
zhaokaiyao@91isoft.com 3ebb6c9dc2 企标库 ,代替标准号 2022-01-24 16:07:29 +08:00
zhaokaiyao@91isoft.com 8f650eeb81 标准入库流程带入标准的目录体系: 多余字段和break条件 2022-01-24 15:11:59 +08:00
zhaokaiyao@91isoft.com 2bc533d3ec Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-22 19:24:03 +08:00
王夏晖 91e4a2c7b3 Merge branch 'develop_3' into 'develop_master'
标准入库流程带入标准的目录体系:返回体系目录名称

See merge request LiuChao/foton-slrs-system-rest!386
2022-01-22 19:15:19 +08:00
zhaokaiyao@91isoft.com 8c5008e869 标准入库流程带入标准的目录体系:返回体系目录名称 2022-01-22 19:13:40 +08:00