FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,463 Commits 1 Branch 0 Tags
67deb52111f73065c112ff799de9dd1be0218b7e
Commit Graph
892 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 89f5d35050 标准excl导入 已知标准类别 2021-11-03 13:53:27 +08:00
super_liu 7e1cc917dd Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!215
 2021-11-03 13:05:37 +08:00
super_liu b023cba2d2 feat: There is no way the 2021-11-03 13:04:56 +08:00
super_liu 869bcdbad8 feat: There is no way the 2021-11-03 13:00:33 +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 e4c5ae815f 标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改 2021-11-01 13:59:32 +08:00
super_liu 6f7e92f686 feat: There is no way the, LAWS 2021-10-30 21:06:07 +08:00
super_liu 1928ae8868 Merge branch 'develop_master' into develop_migration 2021-10-30 00:55:32 +08:00
super_liu 831f8d321a feat: There is no way the 2021-10-29 23:53:33 +08:00
super_liu 62c18594db feat: There is no way the Laws 2021-10-28 18:10:31 +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 2504cac460 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-27 13:36:09 +08:00
super_liu c2e7b589d2 feat: There is no way the 2021-10-27 13:35:51 +08:00
super_liu 89b4bfdd8d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!209
 2021-10-22 18:02:44 +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
yanyizhou 84916bb230 标准法规清单-新增-导出 程序异常 2021-10-21 14:37:34 +08:00
zhaokaiyao@91isoft.com 0ee4f63614 项目清单->项目经理 2021-10-21 13:51:27 +08:00
zhaokaiyao@91isoft.com 4b30022ae5 标准excl导入 2021-10-20 21:30:36 +08:00
zhaokaiyao@91isoft.com 13332aaaa3 车型项目,PCMS组织信息,模块结构同步数据返回值修改,以及车型项目json重写 2021-10-20 21:30:02 +08:00
zhaokaiyao@91isoft.com 4ebe597ed4 Merge remote-tracking branch 'origin/develop_master' into develop_3 
# Conflicts:
#	adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
 2021-10-20 14:53:46 +08:00
zhaokaiyao@91isoft.com bef55f395a TODO模块单元树结构 2021-10-20 14:52:07 +08:00
zhaokaiyao@91isoft.com f6508c6e1a TODO标准excl导入 2021-10-20 14:51:05 +08:00
zhaokaiyao@91isoft.com 7b87743f9f TODO树形结构Hash 2021-10-20 14:49:51 +08:00
2510220824 900bcb9c14 add:福田生产环境配置 2021-10-20 14:36:20 +08:00
zhaokaiyao@91isoft.com d09cdb1d42 通过id绑定责任工程师和责任部门名称 2021-10-20 11:24:49 +08:00
zhaokaiyao@91isoft.com 4d1876b8c4 岗位配置模糊查询分页 2021-10-19 16:49:48 +08:00
zhaokaiyao@91isoft.com 6b914c1430 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-18 17:21:43 +08:00
zhaokaiyao@91isoft.com 60fd2eb999 抽出方法 2021-10-18 17:13:43 +08:00
zhaokaiyao@91isoft.com acbece6b2a 机构树形结构 不采用用递归查询数据库 2021-10-18 16:46:24 +08:00
super_liu 3811b5f682 feat: There is no way the 2021-10-18 14:00:04 +08:00
super_liu 91ff42cb12 feat: There is no way the user jwt 2021-10-18 12:45:02 +08:00
zhaokaiyao@91isoft.com 4286ae309c 标准excl导入 2021-10-17 19:59:00 +08:00
zhaokaiyao@91isoft.com b99983e910 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-17 18:41:13 +08:00
zhaokaiyao@91isoft.com b790264f77 导入标准信息excl导出工具 2021-10-17 18:40:53 +08:00
zhaokaiyao@91isoft.com 33254f05f8 模块结构单元,查询 2021-10-17 16:12:23 +08:00
zhaokaiyao@91isoft.com 9b5bf72fad 文件后缀大写 2021-10-17 14:26:44 +08:00
2510220824 a68d9c9e9d add：修改pcms数据下发接口，统一访问前缀 2021-10-16 09:46:26 +08:00
2510220824 8b479fca0c add:修改用户获取权限，修改pcms数据同步 2021-10-16 09:33:48 +08:00
zhaokaiyao@91isoft.com 4e66ba832f 取消定时同步,手动同步加入白名单 2021-10-14 15:11:06 +08:00
zhaokaiyao@91isoft.com b33d2da29d 定时用户同步,和组织机构同步 2021-10-14 14:40:54 +08:00
zhaokaiyao@91isoft.com 29ef5bafe3 commit temp 2021-10-13 15:39:37 +08:00
zhaokaiyao@91isoft.com a2866cf07e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-13 14:59:12 +08:00
zhaokaiyao@91isoft.com 503523115b 国内外标准->详情->关联模块 2021-10-13 14:48:02 +08:00
Mr.Z a15d20a8be 标准合规评估结果小眼睛查询章节号排序(新增需求根据项目名称排序) 2021-10-09 14:49:28 +08:00
Mr.Z bcc12aeb95 标准合规评估结果小眼睛查询章节号排序初改 2021-10-09 09:31:16 +08:00