Commit Graph
762 Commits
Author SHA1 Message Date
super_liu c333bd9e3e feat: There is no way the, 2021-11-10 12:57:30 +08:00
super_liu 9f36cb53d7 feat: There is no way the, 2021-11-09 12:26:15 +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 541c93a5bb 标准号,标准名称分开搜索 2021-11-07 14:53:01 +08:00
zhaokaiyao@91isoft.com 3f32907acf 过内外标准发布日期排序 2021-11-07 13:47:03 +08:00
super_liu 720a8b45d9 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!220
2021-11-06 23:19:18 +08:00
super_liu 8b12a63925 feat: There is no way the, 2021-11-06 23:17:29 +08:00
zhaokaiyao@91isoft.com f9a39a330b 重点认证标准/政策合规性项目审核流程纳入问题管控 2021-11-05 17:50:54 +08:00
yuezhihang 1b45458739 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-05 17:42:35 +08:00
yuezhihang fbd235b655 工作组 相关代码 表关联以及增删改查 2021-11-05 17:42:27 +08:00
super_liu 3171ce4622 feat: There is no way the, #50742 2021-11-05 10:51:36 +08:00
super_liu 13c66d6b5b feat: There is no way the, tree 2021-11-03 17:35:14 +08:00
super_liu 5c46fa1e74 Merge branch 'develop_master' into develop_migration 2021-11-03 15:48:21 +08:00
super_liu 71dde49296 feat: There is no way the,Laws 2021-11-03 15:45:54 +08:00
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 3cd41c45d7 feat: There is no way the, TO optimize the query 2021-10-22 17:53:11 +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 ed1762a7ec 标准发布日期查询 2021-10-21 18:25:14 +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 740db92f90 commit 2021-10-19 17:58:11 +08:00
zhaokaiyao@91isoft.com f74da3d65d 查询机构人员,模糊查询,不需要id 2021-10-19 17:21:12 +08:00
zhaokaiyao@91isoft.com 8d522a4304 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-19 16:50:06 +08:00
zhaokaiyao@91isoft.com 4d1876b8c4 岗位配置模糊查询分页 2021-10-19 16:49:48 +08:00
2510220824 dba3ce87af Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-19 16:18:34 +08:00