FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
265 Commits 1 Branch 0 Tags
cfd77fadc3822cdf88c108bc5ba401dc28fa3b22
Commit Graph
265 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu cfd77fadc3 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !38
 2021-07-21 05:56:30 +00:00
zhaokaiyao@91isoft.com 706b6ce264 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-21 11:35:58 +08:00
zhaokaiyao@91isoft.com 5825d8793f 修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部 
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
 2021-07-21 11:30:44 +08:00
yuezhihang 1ceee2f1bf Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-21 10:52:26 +08:00
yuezhihang 7d890e7fcd 评估流程 2021-07-21 10:52:22 +08:00
zhaokaiyao@91isoft.com 4cee0f6bf5 修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部 
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
 2021-07-21 10:03:49 +08:00
super_liu c695984425 Merge branch 'develop_3' into 'develop_master' 
feat: 首页标准发布

See merge request !37
 2021-07-19 08:30:43 +00:00
super_liu 7db2b79b63 feat: 首页标准发布 2021-07-19 16:29:52 +08:00
yuezhihang b564ff964a Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-19 14:15:26 +08:00
yuezhihang 8f6bdf4fe8 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-19 14:14:17 +08:00
zzy ff3547f05e update:检索条件 2021-07-19 14:13:41 +08:00
super_liu cada0c2239 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !36
 2021-07-19 04:04:16 +00:00
super_liu 21931a9455 feat: 标准库 2021-07-19 12:02:56 +08:00
duanwenbin a2be968da5 提交分解单列表，增加筛选条件-根据国内外标准筛选 修改一个bug，拆分解单提交功能，报错后不让入库操作 2021-07-19 09:32:23 +08:00
super_liu e80e585f9e Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !35
 2021-07-18 09:11:29 +00:00
super_liu 63181803aa feat: 标准库 2021-07-18 17:10:35 +08:00
王夏晖 eca5c9ae33 Update application-dev.properties 2021-07-16 08:50:12 +00:00
王夏晖 ee73581912 Update application.properties 2021-07-16 08:27:45 +00:00
yuezhihang 299e69b383 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-16 16:05:50 +08:00
zzy be34548613 update:封装标准信息 2021-07-16 16:05:20 +08:00
yuezhihang 22e5bb519c Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-16 14:41:45 +08:00
yuezhihang 2b3bcae6f2 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-16 14:39:25 +08:00
zzy 06c616a682 add：新增标准查询 2021-07-16 14:08:16 +08:00
zxy-lbj 59b8ee7e19 Update application-dev.properties 2021-07-16 03:10:09 +00:00
super_liu d60dfc5671 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !34
 2021-07-15 10:38:32 +00:00
super_liu 5efce6f2d1 feat: vpps model 添加树结构 2021-07-15 18:37:49 +08:00
zzy 12fa95cea9 update：修改字段名称，增加导出 2021-07-15 17:43:19 +08:00
yuezhihang f398d6a245 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 17:37:30 +08:00
yinglong zhang 6f7fb3d25c Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 17:16:32 +08:00
yinglong zhang 7751c75ccf feat 2021-07-15 17:16:21 +08:00
super_liu 23e90a822c Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-07-15 17:16:11 +08:00
super_liu 90e701154d Merge branch 'develop_3' into 'develop_master' 
feat: 标准入库流程 带入 逻辑

See merge request !33
 2021-07-15 09:15:45 +00:00
super_liu de97f459fd feat: 标准入库流程 带入 逻辑 2021-07-15 17:14:54 +08:00
zzy 369e1532bc update：增加意见详情查询字段 
add：分解单查询时间
 2021-07-15 16:41:37 +08:00
yuezhihang f96bbb6082 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 16:23:34 +08:00
王夏晖 f52e33fa3c Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !32
 2021-07-15 06:24:04 +00:00
duanwenbin 78b99accc9 提交树形结构代码 2021-07-14 16:17:50 +08:00
zzy 2e0f6e7934 update：修改意见导出 2021-07-14 13:51:40 +08:00
yinglong zhang 8aed75a8f0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-13 15:36:33 +08:00
yinglong zhang 35d86a7222 feat 未合规项整改 2021-07-13 15:36:17 +08:00
super_liu 8aa0d66d0e Merge branch 'develop_3' into 'develop_master' 
feat: 添加企业标准库 接口服务

See merge request !24
 2021-07-13 06:27:51 +00:00
super_liu 9930cbae9b feat: 添加企业标准库 接口服务 2021-07-13 14:25:06 +08:00
yuezhihang d944ad54d7 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-13 10:34:16 +08:00
super_liu cdf0ecd04e Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 详情 文件类 修改

See merge request !23
 2021-07-12 10:10:37 +00:00
duanwenbin 718e261ff6 提交本地工具-标准拆分缺失的编辑接口 2021-07-12 18:10:11 +08:00
super_liu 51ed1c269d feat: 标准库 详情 文件类 修改 2021-07-12 18:09:24 +08:00
zj 55a47c6973 add:增加ProjectManager 2021-07-12 17:30:40 +08:00
super_liu a160d81c9e Merge branch 'develop_3' into 'develop_master' 
feat: 标准文本信息上传

See merge request !22
 2021-07-12 03:03:37 +00:00
super_liu f41d94bbd9 feat: 标准文本信息上传 2021-07-12 11:02:11 +08:00
super_liu b335387242 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !21
 2021-07-11 07:49:10 +00:00