FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
362 Commits 1 Branch 0 Tags
e237170f6199ee767a6a941580bca525de24da8d
Commit Graph
115 Commits
Author SHA1 Message Date
王夏晖 e237170f61 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !64
 2021-07-28 02:49:56 +00:00
zzy b3630e8ad6 update：修复导出 2021-07-28 10:10:25 +08:00
王夏晖 d5ed912644 Merge branch 'develop_1' into 'develop_master' 
update：清单增加字段

See merge request !60
 2021-07-27 07:41:14 +00:00
zhaokaiyao@91isoft.com 9d4600b96c Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-27 09:20:28 +08:00
zzy c3c69e87ef update：清单增加字段 2021-07-27 09:20:27 +08:00
zhaokaiyao@91isoft.com f4c7b2ba68 Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
 2021-07-26 20:12:12 +08:00
zhaokaiyao@91isoft.com 9cd93436c4 修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题 2021-07-26 20:07:38 +08:00
zzy ad2b29f072 update：清单修改，时间查询 2021-07-26 17:57:44 +08:00
zzy 404730d522 update：清单查询，增加字段 2021-07-26 14:53:51 +08:00
super_liu c608e52226 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !52
 2021-07-25 12:50:49 +00:00
super_liu 8a263964f6 feat: 企业标准库 迁移1 2021-07-25 20:41:38 +08:00
zzy 06aa79e3f6 update：增加高级查询 2021-07-23 15:03:02 +08:00
zzy 3cafbfbb6f Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
 2021-07-22 16:25:23 +08:00
zzy 91c4dea4db update:清单导出，增加编辑，修复bug 2021-07-22 16:10:53 +08:00
super_liu f840e2e79d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !40
 2021-07-21 11:15:31 +00:00
super_liu 4dfb0039ad feat: 迁移企业标准库 国内外标准库 懒加载 树结构 2021-07-21 19:14:22 +08:00
yuezhihang b20e1480e3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-21 16:41:42 +08:00
yuezhihang 310cdf9473 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
 2021-07-21 14:07:53 +08:00
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
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
zj 409fa79bdc add:车型项目库 调取 批量删除 导出 2021-07-20 15:12:45 +08:00
zzy 632c4b2f67 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-07-20 10:35:00 +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
zzy e3e638a8b3 update:sql语句 2021-07-19 14:22:13 +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
duanwenbin a2be968da5 提交分解单列表，增加筛选条件-根据国内外标准筛选 修改一个bug，拆分解单提交功能，报错后不让入库操作 2021-07-19 09:32:23 +08: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
zzy 06c616a682 add：新增标准查询 2021-07-16 14:08:16 +08: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 369e1532bc update：增加意见详情查询字段 
add：分解单查询时间
 2021-07-15 16:41:37 +08:00
王夏晖 f52e33fa3c Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !32
 2021-07-15 06:24:04 +00:00
super_liu 9930cbae9b feat: 添加企业标准库 接口服务 2021-07-13 14:25:06 +08:00
zj 55a47c6973 add:增加ProjectManager 2021-07-12 17:30:40 +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
super_liu 43434a68e0 feat: 标准库 2021-07-11 15:47:02 +08:00
super_liu 4cf827998b Merge branch 'develop_3' into 'develop_master' 
feat: 入库流程 属性字段对应

See merge request !20
 2021-07-10 07:52:58 +00:00
super_liu 48933b44dc feat: 入库流程 属性字段对应 2021-07-10 15:43:35 +08:00
super_liu a535f138d9 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 体系树形结构等

See merge request !19
 2021-07-09 10:17:43 +00:00
super_liu c06cb07db6 feat: 标准库 体系树形结构等 2021-07-09 18:16:10 +08:00
yuezhihang 00798eb2b1 产品线 数据 2021-07-09 15:28:15 +08:00
yuezhihang aed855e336 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
 2021-07-09 14:33:21 +08:00