 yuezhihang
|
0bee1e9cf7
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-27 16:51:43 +08:00 |
|
|
yuezhihang
|
5e8b70c41e
|
国家地区清单关联之后查询 出现多条重复标准挂载 问题修复
|
2021-12-27 16:51:35 +08:00 |
|
|
王夏晖
|
424b84a7fb
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!327
|
2021-12-27 16:34:21 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
cdffdad6ad
|
标准导出字典转换
|
2021-12-27 16:07:29 +08:00 |
|
|
yuezhihang
|
c41a19a1ab
|
企标制修订计划查询失效bug修复
|
2021-12-27 15:46:11 +08:00 |
|
|
yuezhihang
|
840b426adc
|
采标程度连表查询
|
2021-12-27 15:38:25 +08:00 |
|
|
yuezhihang
|
f2d8482eeb
|
企标制修订计划入库
|
2021-12-27 15:26:15 +08:00 |
|
|
yuezhihang
|
78bd7e1bde
|
清单导出缺少数据 应该只在国家地区清单出现！已修复
|
2021-12-27 11:01:45 +08:00 |
|
|
yuezhihang
|
b450d1486c
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-25 16:47:58 +08:00 |
|
|
yuezhihang
|
c7b0affb87
|
计划库新增字段及逻辑
|
2021-12-25 16:47:50 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
057ce691d6
|
标准导出字典转换
|
2021-12-25 13:40:41 +08:00 |
|
|
王夏晖
|
56c7b5d98e
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!322
|
2021-12-25 09:33:25 +08:00 |
|
|
yuezhihang
|
f999a8fd77
|
合规评估查询失效bug修复
|
2021-12-24 17:07:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ea777f2c3e
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-12-24 15:23:04 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d9996eeac2
|
预警性能 不使用转列改为使用正则
|
2021-12-24 15:22:37 +08:00 |
|
|
yuezhihang
|
1115c81244
|
未符合项查询
|
2021-12-24 11:12:04 +08:00 |
|
|
yuezhihang
|
c29a0070df
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-24 09:50:03 +08:00 |
|
|
yuezhihang
|
93d6af7d66
|
会议信息修改bug修复
|
2021-12-24 09:49:52 +08:00 |
|
|
yuezhihang
|
b33c643622
|
未符合项基础模块-->历史数据查询失效bug修复
|
2021-12-24 09:49:21 +08:00 |
|
|
super_liu
|
60c4957bcb
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!319
|
2021-12-23 22:03:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2bd9e7f323
|
查询总数
|
2021-12-23 16:11:36 +08:00 |
|
|
yuezhihang
|
d1cf56c660
|
标准比对导出表格和标准比对导出图片
|
2021-12-23 15:05:32 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5c0756fcbf
|
注释
|
2021-12-23 14:23:38 +08:00 |
|
|
yuezhihang
|
cb471942cb
|
标准比对导出bug修复 + 法规清单查询修复
|
2021-12-23 14:20:25 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d412036280
|
资料中心添加字段 dataExplain
|
2021-12-23 14:02:53 +08:00 |
|
|
yuezhihang
|
ce45170582
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-23 10:45:59 +08:00 |
|
|
yuezhihang
|
dcd7ec0bd8
|
国家地区清单 才拿xccssrqgj 其他拿xccssrq
|
2021-12-23 10:45:51 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c9e08a1fb5
|
国内外日期查询 总数错误
|
2021-12-22 20:34:40 +08:00 |
|
|
王夏晖
|
7d6a2be540
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request LiuChao/foton-slrs-system-rest!314
|
2021-12-22 19:24:29 +08:00 |
|
|
王夏晖
|
d99b9cfc7c
|
Merge branch 'develop_3' into 'develop_master'
国内外标准代替标准号查询
See merge request LiuChao/foton-slrs-system-rest!313
|
2021-12-22 19:23:48 +08:00 |
|
|
yanyizhou
|
59319f0a27
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-12-22 17:59:20 +08:00 |
|
|
yanyizhou
|
dd8d2e2151
|
分解单编辑功能
|
2021-12-22 17:59:07 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6df2b5a7d3
|
国内外标准代替标准号查询
|
2021-12-22 17:50:23 +08:00 |
|
|
yuezhihang
|
b0b6a6f391
|
会议信息修改bug修复
|
2021-12-22 16:24:10 +08:00 |
|
|
yanyizhou
|
f8c9ab1d55
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-12-22 15:09:05 +08:00 |
|
|
yuezhihang
|
5f5051bd2f
|
未符合项bug修复 --->新增支持查询责任部门
|
2021-12-22 14:03:11 +08:00 |
|
|
yuezhihang
|
8c72debb05
|
责任部门导出和日历修改 bug修复
|
2021-12-22 11:09:20 +08:00 |
|
|
yuezhihang
|
5e1df05c6b
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-21 20:42:18 +08:00 |
|
|
yuezhihang
|
22cc39c0e2
|
标准化活动参会入会
|
2021-12-21 20:42:06 +08:00 |
|
|
super_liu
|
223008e42b
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!310
|
2021-12-21 17:21:08 +08:00 |
|
|
super_liu
|
8b225fbb14
|
feat: There is no way the,
|
2021-12-21 17:01:48 +08:00 |
|
|
super_liu
|
8ef5e27843
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!308
|
2021-12-21 14:41:06 +08:00 |
|
|
super_liu
|
382f42b8e5
|
feat: There is no way the,
|
2021-12-21 14:39:06 +08:00 |
|
|
yuezhihang
|
1d2fcd4a27
|
项目清单查询
|
2021-12-21 14:13:44 +08:00 |
|
|
yuezhihang
|
3880e0c68f
|
标准维度选数据出现全空数据的问题
|
2021-12-21 11:05:26 +08:00 |
|
|
yuezhihang
|
caed5e20a3
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-21 10:13:01 +08:00 |
|
|
yuezhihang
|
d05f5eb388
|
法规清单人名回显问题
|
2021-12-21 10:12:55 +08:00 |
|
|
王夏晖
|
999f277c13
|
Merge branch 'develop_3' into 'develop_master'
预警
See merge request LiuChao/foton-slrs-system-rest!304
|
2021-12-20 20:28:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1432bdb520
|
预警
|
2021-12-20 20:26:51 +08:00 |
|
|
yuezhihang
|
e8b84b3088
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-20 18:04:02 +08:00 |
|