FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,850 Commits 1 Branch 0 Tags
4bd68bb39de9ab4f0f98b54d968f1ca3bb2b16ff
Commit Graph
1271 Commits
Author SHA1 Message Date
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
2510220824 c97e8442f4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-21 08:13:03 +08:00
2510220824 c239ad7c99 update:无岗位用户无法访问系统 2022-01-21 08:12:15 +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
zhaokaiyao@91isoft.com eb15c06699 工作组批量删除 2022-01-20 17:19: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
王夏晖 42b8651544 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!380
 2022-01-19 19:34:32 +08:00
zhaokaiyao@91isoft.com ebe6cd5bf7 编辑判断不能重复时排除自身 规范了返回值 2022-01-19 19:29:40 +08:00
yuezhihang 5f6394975a Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-19 18:23:17 +08:00
yuezhihang a2b38c85d3 调研接口修复 2022-01-19 18:23:10 +08:00
zhaokaiyao@91isoft.com d49893bdf1 为定时任务加上了日志 2022-01-19 17:46:23 +08:00
super_liu d5bf93da2b Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!379
 2022-01-19 17:23:55 +08:00
super_liu 3bd285aacd feat: There is no way the, 2022-01-19 17:17:24 +08:00
yuezhihang 4821c6c34b 导出去html标签 2022-01-19 16:47:43 +08:00
yuezhihang 07ce4f1866 流程新需求 2022-01-19 16:27:39 +08:00
zhaokaiyao@91isoft.com 0612cb210a 定时任务 VALID_FLAG='0' 2022-01-19 15:14:43 +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 e6d9f4a652 判断工作组名不能重复 2022-01-19 13:28:24 +08:00
zhaokaiyao@91isoft.com 50d262b610 commit 2022-01-19 13:14:27 +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
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 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
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
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