FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,820 Commits 1 Branch 0 Tags
07ce4f1866bc62de7573edddba8ffb6e7e1d1bd5
Commit Graph
133 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 50d262b610 commit 2022-01-19 13:14:27 +08:00
zhaokaiyao@91isoft.com 84a246ea06 修复了定时更新文本状态,由于海外标准的格式与不与国内相同,添加了新的标准号查询方法 2022-01-15 17:02:26 +08:00
zhaokaiyao@91isoft.com 4af705e1bd 查询列表添加代替标准号 dtbzh字段 2022-01-13 10:31:40 +08:00
zhaokaiyao@91isoft.com 7594824a76 企标日期查询 2022-01-10 17:54:37 +08:00
zhaokaiyao@91isoft.com 9791fd13e9 企标高级查询 2022-01-07 17:10:21 +08:00
zhaokaiyao@91isoft.com be24afce0e 国内外自定义查询接口 添加对范围日期和多选的查询支持 2022-01-07 14:16:35 +08:00
zhaokaiyao@91isoft.com b0cd4806c4 commit 2021-12-30 21:55:15 +08:00
zhaokaiyao@91isoft.com b8c494d4c5 国内外excel导出code转字符 2021-12-29 15:55:58 +08:00
zhaokaiyao@91isoft.com cdffdad6ad 标准导出字典转换 2021-12-27 16:07:29 +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 c9e08a1fb5 国内外日期查询 总数错误 2021-12-22 20:34:40 +08:00
super_liu 8b225fbb14 feat: There is no way the, 2021-12-21 17:01:48 +08:00
王夏晖 28e5923544 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!299
 2021-12-20 17:02:18 +08:00
yuezhihang 09e7e2ffee 标准查询没有total问题修复 2021-12-20 13:51:57 +08:00
zhaokaiyao@91isoft.com 20877855aa 国内外 发布日期查询 2021-12-17 16:11:37 +08:00
zhaokaiyao@91isoft.com a8544607de 高级搜索 发布日期范围查询 2021-12-17 10:55:44 +08:00
zhaokaiyao@91isoft.com 3bf802fd75 国内外删除提示 2021-12-16 20:47:45 +08:00
yuezhihang 45dab72515 标准条件查询 2021-12-09 16:55:55 +08:00
王夏晖 359a384c70 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!270
 2021-12-06 18:11:09 +08:00
zhaokaiyao@91isoft.com 3e877d48fe 去除多选日期时分秒 2021-12-06 14:06:20 +08:00
yuezhihang 830f259792 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-06 09:45:45 +08:00
yuezhihang 3a952eea82 项目清单 新增字段符合-未符合-不展示逻辑 以及部分条件下未维护清单不显示问题 2021-12-06 09:45:36 +08:00
王夏晖 ffde83f71e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!268
 2021-12-05 21:08:16 +08:00
zhaokaiyao@91isoft.com 691e7b6bcc 更新法规是否纳入法规清单 2021-12-05 20:56:32 +08:00
yuezhihang 7f88babb5f 项目清单加字段 ！ 白名单添加一个导出 2021-12-05 15:09:19 +08:00
王夏晖 e7302f306d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!263
 2021-12-01 20:54:21 +08:00
yuezhihang 455fc2ba0e 12.1bug修复 2021-12-01 17:59:17 +08:00
zhaokaiyao@91isoft.com f76e0aabe5 取消事务 2021-12-01 16:49:45 +08:00
zhaokaiyao@91isoft.com d977214a56 预警查询 2021-12-01 11:25:56 +08:00
zhaokaiyao@91isoft.com b43cc664e2 //todo 2021-11-30 20:47:46 +08:00
zhaokaiyao@91isoft.com 79f0dd6c90 当文件被拆分后才在详情显示分解单按钮,取消拆分后自动导入分解单 2021-11-23 16:33:49 +08:00
super_liu 01568460ca feat: There is no way the, 2021-11-13 22:37:24 +08:00
super_liu d6432e2746 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!226
 2021-11-10 13:16:27 +08:00
super_liu c333bd9e3e feat: There is no way the, 2021-11-10 12:57:30 +08:00
yuezhihang 1e61e5cfb4 清单查询bug 2021-11-07 19:00:08 +08:00
yuezhihang 438ee5ff5f 合规评估-标准维度查询不出来bug修复 以及导出接口白名单 2021-11-07 17:00:49 +08:00
super_liu 8b401b8832 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!222
 2021-11-07 16:49:22 +08:00
zhaokaiyao@91isoft.com 3f32907acf 过内外标准发布日期排序 2021-11-07 13:47:03 +08:00
super_liu 8b12a63925 feat: There is no way the, 2021-11-06 23:17:29 +08:00
super_liu 3171ce4622 feat: There is no way the, #50742 2021-11-05 10:51:36 +08:00
super_liu 3cd3266899 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!214
 2021-11-01 18:03:47 +08:00
super_liu cab90f06ee feat: There is no way the,Laws 2021-11-01 17:59:24 +08:00
yuezhihang d42d9f34f4 标准详情分页查询 ；老版本新接口 2021-11-01 17:23:09 +08:00
yuezhihang 0d18758178 项目评估流程标准维度-查询数据来源修复 2021-10-27 13:47:29 +08:00
yuezhihang 9ec34d5125 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-10-27 13:39:58 +08:00
yuezhihang d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 2021-10-27 13:39:07 +08:00
super_liu c2e7b589d2 feat: There is no way the 2021-10-27 13:35:51 +08:00
super_liu 1918e0da78 feat: There is no way the, TO optimize the query 2021-10-22 17:03:29 +08:00
super_liu 9eff2340a2 feat: There is no way the, TO optimize the query 2021-10-22 15:50:07 +08:00
zhaokaiyao@91isoft.com d09cdb1d42 通过id绑定责任工程师和责任部门名称 2021-10-20 11:24:49 +08:00