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

See merge request !50
 2021-07-23 08:03:18 +00:00
王夏晖 601799acf6 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !49
 2021-07-23 07:57:56 +00:00
zzy 1f57316d3e update：解决冲突 2021-07-23 15:56:56 +08:00
zzy 33c71b10e8 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-07-23 15:56:18 +08:00
zj 84c8c949bb update:优化sql one more time 2021-07-23 15:55:10 +08:00
zzy 3fb8bfafb9 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
 2021-07-23 15:16:16 +08:00
zzy 06aa79e3f6 update：增加高级查询 2021-07-23 15:03:02 +08:00
zhaokaiyao@91isoft.com 66f9763b96 添加了修改第三方链接排序接口 2021-07-23 15:00:47 +08:00
王夏晖 dc884c0162 Merge branch 'develop_1' into 'develop_master' 
update:优化sql

See merge request !46
 2021-07-23 06:56:07 +00:00
zj 8ec8db0437 update:优化sql 2021-07-23 14:51:45 +08:00
yuezhihang 8d1280d484 标准清单入库 bug修复 2021-07-23 12:51:27 +08:00
王夏晖 03723a1522 Merge branch 'develop_1' into 'develop_master' 
update：回复配置文件

See merge request !44
 2021-07-22 09:26:17 +00:00
zzy c4e563081a update：回复配置文件 2021-07-22 17:04:55 +08:00
王夏晖 454af6e305 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !42
 2021-07-22 08:32:12 +00: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
zhaokaiyao@91isoft.com 6c7baa65af Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-22 14:53:08 +08:00
zhaokaiyao@91isoft.com 2ca543d981 添加岗位时,设置操作时间为当前系统时间 2021-07-22 14:52:11 +08:00
zhaokaiyao@91isoft.com b3f9244345 修改了国内法规导出excl表单的字段 2021-07-22 10:58:22 +08:00
yuezhihang ae16a14ea1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-22 10:26:14 +08:00
yuezhihang 2783e02b1e 链接新增bug 修复 2021-07-22 10:26:09 +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 7f874329a8 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-21 19:14:36 +08:00
super_liu 4dfb0039ad feat: 迁移企业标准库 国内外标准库 懒加载 树结构 2021-07-21 19:14:22 +08:00
Wanghong 462068b90a 修改未符合项查询bug 2021-07-21 18:17:09 +08:00
Wanghong eaa9681269 修复未符合项查询bug 2021-07-21 18:04:48 +08:00
Wanghong 6f3a3f2634 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-07-21 17:59:20 +08:00
yuezhihang b20e1480e3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-21 16:41:42 +08:00
yuezhihang 3595ea2aa3 标准清单入库 bug修复 2021-07-21 16:41:37 +08:00
Wanghong 1ad63eff70 默认变更列表 2021-07-21 16:02:50 +08:00
zhaokaiyao@91isoft.com 7618db7a47 ("/${restPath}/person/personCollect")添加收藏,查询收藏,取消收藏 2021-07-21 15:18:58 +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
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
zzy 3af52f37f4 update:缩短查询时间 2021-07-20 16:39:51 +08:00
Wanghong 622da17650 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-07-20 15:29:17 +08:00
zj 409fa79bdc add:车型项目库 调取 批量删除 导出 2021-07-20 15:12:45 +08:00
zzy 8ce15424ac update:修复清单bug 2021-07-20 13:36:55 +08:00
Wanghong ce1ba143aa Merge branch 'develop_1' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_1 2021-07-20 11:07:05 +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