Commit Graph
688 Commits
Author SHA1 Message Date
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
王夏晖 96c71c50a4 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!385
2022-01-22 16:46:43 +08:00
zhaokaiyao@91isoft.com 412e9a98be 标准征求意见 文本类型和分解单一致 2022-01-22 15:24:00 +08:00
yuezhihang 5d0df6d02c 机构管理最新需求 2022-01-21 18:54:21 +08:00
yuezhihang 278e6d05bb Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-21 14:48:10 +08:00
yuezhihang 5f9f162535 标准合规评估流程的查询接口 2022-01-21 14:48:00 +08:00
super_liu 0c387355b4 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!381
2022-01-20 20:43:52 +08:00
yuezhihang d86f1c12cd 标准合规评估 2022-01-20 16:21:09 +08:00
yuezhihang 888240c86c 流程准备的接口 2022-01-20 15:20:41 +08:00
zhaokaiyao@91isoft.com f3101d6e74 企标详情 文本状态显示textStatusBussShow 2022-01-20 15:07:55 +08:00
yuezhihang 4826332deb 标准合规评估 准备的接口 2022-01-20 15:05:23 +08:00
yuezhihang a2b38c85d3 调研接口修复 2022-01-19 18:23:10 +08:00
zhaokaiyao@91isoft.com 0a4fb00ea5 工作组,表字段与实体类 2022-01-19 15:14:07 +08:00
zhaokaiyao@91isoft.com cb2dde3bb2 VALID_FLAG = '0' 2022-01-19 13:43:58 +08:00
zhaokaiyao@91isoft.com fac8ad54bf Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-18 22:54:20 +08:00
zhaokaiyao@91isoft.com 06c14bd8cd 工作组接口 2022-01-18 22:53:51 +08:00
super_liu 3a2ef34b80 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, plan lxd

See merge request LiuChao/foton-slrs-system-rest!374
2022-01-18 16:31:53 +08:00
super_liu 2f18292492 feat: There is no way the, plan lxd 2022-01-18 16:28:20 +08:00
zhaokaiyao@91isoft.com 4da914c88a 新增自定义工作组模块 2022-01-18 15:39:54 +08:00
zhaokaiyao@91isoft.com 4a821e87b5 Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-17 15:51:00 +08:00
zhaokaiyao@91isoft.com 84a246ea06 修复了定时更新文本状态,由于海外标准的格式与不与国内相同,添加了新的标准号查询方法 2022-01-15 17:02:26 +08:00
super_liu 4e362e485b Merge branch 'develop_3' into 'develop_master'
企标查询 忽略空格

See merge request LiuChao/foton-slrs-system-rest!371
2022-01-14 06:38:06 +08:00
zhaokaiyao@91isoft.com e60667999a 企标查询 忽略空格 2022-01-13 16:08:41 +08:00
王夏晖 6421735d7b Merge branch 'develop_3' into 'develop_master'
查询列表添加代替标准号 dtbzh字段

See merge request LiuChao/foton-slrs-system-rest!370
2022-01-13 11:31:19 +08:00
zhaokaiyao@91isoft.com 4af705e1bd 查询列表添加代替标准号 dtbzh字段 2022-01-13 10:31:40 +08:00
yuezhihang 97519f1813 解读合并之后数据消失bug修复 以及会后流程自动发起 恢复到每天十点 2022-01-12 15:57:50 +08:00
yuezhihang 7f44d04f0f Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-12 11:44:48 +08:00
zhaokaiyao@91isoft.com 8d7466b9d7 预警 条款内容 2022-01-12 11:21:18 +08:00
yuezhihang d93e9fb2ba 征求意见bug修复 2022-01-12 11:00:25 +08:00
zhaokaiyao@91isoft.com d4ef4e3477 预警 在产车实施日期查询 使用了两个startZCCSSRQ 2022-01-11 22:33:28 +08:00
zhaokaiyao@91isoft.com 8a9971c046 预警 发布日期查询与回显 2022-01-11 22:27:36 +08:00
zhaokaiyao@91isoft.com 70ee309ac2 Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-11 13:56:45 +08:00
yuezhihang bf0d4c2106 公开征求意见导出修改 2022-01-11 10:14:35 +08:00
zhaokaiyao@91isoft.com 1b2c595f50 预警导出 2022-01-10 20:48:41 +08:00
yuezhihang 596528bcbf 公开征求意见模块导出上报意见功能 修复 2022-01-10 18:10:09 +08:00
zhaokaiyao@91isoft.com 7594824a76 企标日期查询 2022-01-10 17:54:37 +08:00
yuezhihang fbde67fd7f 征求意见流程内部导出 bug修复 2022-01-10 17:27:09 +08:00
zhaokaiyao@91isoft.com 557a9f756c 预警存入日期表的数据应该在预警期限内,查询预警数据时已逻辑删除的数据不显示 2022-01-10 12:49:56 +08:00
yuezhihang 5f67b22e7c 条款比对出现比对完成状态 2022-01-07 17:16:32 +08:00
王夏晖 b6f30bb322 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!362
2022-01-07 15:52:39 +08:00