 2510220824
|
d7cd2d9fae
|
update:pcms车型项目接收到的数据新增3个字段
|
2021-12-29 21:39:07 +08:00 |
|
|
2510220824
|
f068dacc7f
|
update:pcms车型项目接收到的数据新增3个字段
|
2021-12-29 17:36:07 +08:00 |
|
|
王夏晖
|
cab273dae4
|
Merge branch 'develop_3' into 'develop_master'
标准号查询总数与数据数量不一致
See merge request LiuChao/foton-slrs-system-rest!335
|
2021-12-29 14:54:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ad8f68de4c
|
标准号查询总数与数据数量不一致
|
2021-12-29 14:24:59 +08:00 |
|
|
yuezhihang
|
36ff1dd510
|
企标计划库新增字段
|
2021-12-29 10:46:58 +08:00 |
|
|
yuezhihang
|
76846c8357
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-29 10:44:24 +08:00 |
|
|
yuezhihang
|
9ed5f88d1c
|
解读流程 入库数据消失 bug修复
|
2021-12-29 10:44:16 +08:00 |
|
|
super_liu
|
3595251fde
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss plan add bussSort
See merge request LiuChao/foton-slrs-system-rest!333
|
2021-12-29 10:32:01 +08:00 |
|
|
super_liu
|
b63d82a43e
|
feat: There is no way the, buss plan add bussSort
|
2021-12-29 10:30:45 +08:00 |
|
|
王夏晖
|
9c39c5e663
|
Merge branch 'develop_3' into 'develop_master'
根据标准id查询存在分解单的文本类型
See merge request LiuChao/foton-slrs-system-rest!331
|
2021-12-29 09:11:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4c65fb97d4
|
根据标准id查询存在分解单的文本类型
|
2021-12-28 19:41:37 +08:00 |
|
|
yuezhihang
|
da0eda3020
|
企标制修订计划库 crud
|
2021-12-28 16:38:58 +08:00 |
|
|
yuezhihang
|
312eb47dfe
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-27 19:50:47 +08:00 |
|
|
yuezhihang
|
f215eeef72
|
公开征求意见 查询bug修复
|
2021-12-27 19:50:38 +08:00 |
|
|
super_liu
|
94d5d2e128
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss2 process
See merge request LiuChao/foton-slrs-system-rest!329
|
2021-12-27 17:47:33 +08:00 |
|
|
super_liu
|
7e4fbe6ea1
|
feat: There is no way the, buss2 process
|
2021-12-27 17:45:51 +08:00 |
|
|
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 |
|