 yuezhihang
|
07ce4f1866
|
流程新需求
|
2022-01-19 16:27:39 +08:00 |
|
|
王夏晖
|
a602c5fc3f
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!378
|
2022-01-19 15:16:16 +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 |
|
|
王夏晖
|
5d53017187
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!377
|
2022-01-19 13:34:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e6d9f4a652
|
判断工作组名不能重复
|
2022-01-19 13:28:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5ded56b442
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2022-01-19 13:15:13 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
868d11be91
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2022-01-19 13:14:51 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
50d262b610
|
commit
|
2022-01-19 13:14:27 +08:00 |
|
|
张君
|
5291f3cf69
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2022-01-19 10:20:08 +08:00 |
|
|
张君
|
87b843c398
|
es字段
|
2022-01-19 10:19:16 +08:00 |
|
|
王夏晖
|
57bc0f0057
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!375
|
2022-01-18 22:56:50 +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 |
|
|
zyd
|
d18185e0b7
|
fix:修复VPPS查询中将其他非本节点下的数据查询出来的BUG
|
2022-01-18 22:12:14 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ca79108b71
|
日志与手动激活定时任务
|
2022-01-18 21:42:13 +08:00 |
|
|
张君
|
54ef64c852
|
注释
|
2022-01-18 17:09:03 +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 |
|
|
super_liu
|
fe9d3c6ec6
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!373
|
2022-01-18 03:42:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
dccdd471f0
|
当在编辑标准的国家地区的时候,自动添加到国家地区清单中,并且把标准的是否纳入认证清单改为"是"
|
2022-01-17 17:31:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4acc77b0d5
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2022-01-17 17:04:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e583938008
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2022-01-17 17:02:21 +08:00 |
|
|
yuezhihang
|
087f629216
|
清单 问题修复
|
2022-01-17 17:00:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
68d9044bf5
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2022-01-17 16:41:09 +08:00 |
|
|
yuezhihang
|
4a4b99ad1c
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-01-17 16:37:42 +08:00 |
|
|
yuezhihang
|
c2ddb5a92b
|
清单 新增和修改部分 对标准库的反打
|
2022-01-17 16:37:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
70be635a9a
|
if()没有大括号
|
2022-01-17 15:57:42 +08:00 |
|
|
王夏晖
|
728cd5d48f
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!372
|
2022-01-17 15:54:17 +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
|
0136a396e0
|
高级搜索advanceVOStr日期等值查询
|
2022-01-17 15:49:31 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2abdb7e253
|
去除未被使用的代码
|
2022-01-15 17:05:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
84a246ea06
|
修复了定时更新文本状态,由于海外标准的格式与不与国内相同,添加了新的标准号查询方法
|
2022-01-15 17:02:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
421df00d9b
|
修复日志错误,修改了sar_stand_attr_detail中的sycpx和TXLB以及责任部门查询不到返回本身
|
2022-01-15 15:30:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c8bd8fefcf
|
更改了日志发生错误的字段(sar_stand_attr_detail表的SEL_VAl字段),添加了对非属性字段标准性质的日志转换字典支持
|
2022-01-15 14:54:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fa7f765195
|
根据 "用户id" 查询不到用户名时返回 "用户id"
|
2022-01-14 13:57:48 +08:00 |
|
|
yuezhihang
|
70d8ba058b
|
项目评估流程 -- 去重
|
2022-01-14 11:31:05 +08:00 |
|
|
yuezhihang
|
509905195a
|
回滚
|
2022-01-14 10:59:40 +08:00 |
|
|
yuezhihang
|
bfa6f94452
|
项目评估结果去重
|
2022-01-14 10:44:30 +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 |
|
|
yuezhihang
|
07066ea00d
|
条款比对信息查询
|
2022-01-13 16:20:55 +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 |
|
|
super_liu
|
3aa9aba85c
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!369
|
2022-01-13 06:18:49 +08:00 |
|
|
super_liu
|
2659f0a783
|
feat: There is no way the,
|
2022-01-12 23:58:15 +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 |
|