FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
736 Commits 1 Branch 0 Tags
07bd24b7cf98811b921e8ea204e42a529601c634
Commit Graph
189 Commits
Author SHA1 Message Date
yuezhihang ca80dd9feb Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-09 17:55:11 +08:00
yuezhihang 3dd392b411 过滤数据！！！ 2021-08-09 17:52:01 +08:00
王夏晖 d7ed47a58f Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !99
 2021-08-09 09:11:47 +00:00
2510220824 4302fed66f Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-09 17:10:30 +08:00
zhaokaiyao@91isoft.com 7a51e1d9b4 标准详情->标准分解单查询 mapper<if>字符 2021-08-09 16:56:29 +08:00
yuezhihang 1b8884fe75 车型项目库！ 2021-08-09 11:07:26 +08:00
zhaokaiyao@91isoft.com b0eeb87bd1 标准详情->标准分解单查询 2021-08-08 22:40:37 +08:00
yanyizhou 9f4bbd2eb6 修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug 2021-08-08 10:17:38 +08:00
yuezhihang 82b72b191d 解读入库 2021-08-05 14:51:45 +08:00
Mr.Z 6eb0ed526e 标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误 2021-08-04 20:09:44 +08:00
super_liu 1e1be015fe Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !89
 2021-08-03 07:50:29 +00:00
zhaokaiyao@91isoft.com 294866bb1e 修复了标准拆分--拆分页面，该页面的数据回显重复的问题 2021-08-03 14:28:47 +08:00
zzy ed4dd5ae23 update：增加字段 2021-07-30 17:55:43 +08:00
zzy faef2cdf59 Update：标准解读流程检索 2021-07-30 16:45:23 +08:00
zzy 3c68a2a668 Merge remote-tracking branch 'origin/develop_3' into develop_1 2021-07-30 16:43:39 +08:00
王夏晖 0d2ac245b2 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !76
 2021-07-30 01:01:28 +00:00
super_liu 00894cbeef Merge branch 'develop_master' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-07-30 00:54:34 +08:00
super_liu d7f3fc9f95 feat: 国内外标准 反向标准显示逻辑 2021-07-30 00:48:48 +08:00
zzy dd281f63ad Update：清单高级检索 2021-07-29 16:59:25 +08:00
yuezhihang a017d3acd6 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-29 15:22:23 +08:00
zzy 9d3d8e1198 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-07-29 15:19:39 +08:00
zzy 80226d5cfb update：修改清单信息 2021-07-29 11:14:47 +08:00
王夏晖 a991f1550c Merge branch 'develop_1' into 'develop_master' 
update：修改sql语句

See merge request !65
 2021-07-28 06:18:22 +00:00
zzy 6dc14af762 update：修改sql语句 2021-07-28 14:05:11 +08:00
王夏晖 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