FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,100 Commits 1 Branch 0 Tags
7b87743f9f12bff59f0cc1917527c30d9d4c09f8
Commit Graph
719 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 7b87743f9f TODO树形结构Hash 2021-10-20 14:49:51 +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
2510220824 59c8f0f60b add:优化机构管理人员查询，不传机构就查全部 2021-10-19 16:18:11 +08:00
zhaokaiyao@91isoft.com 6b914c1430 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-18 17:21:43 +08:00
zhaokaiyao@91isoft.com 60fd2eb999 抽出方法 2021-10-18 17:13:43 +08:00
zhaokaiyao@91isoft.com acbece6b2a 机构树形结构 不采用用递归查询数据库 2021-10-18 16:46:24 +08:00
super_liu 3811b5f682 feat: There is no way the 2021-10-18 14:00:04 +08:00
super_liu 91ff42cb12 feat: There is no way the user jwt 2021-10-18 12:45:02 +08:00
zhaokaiyao@91isoft.com 4286ae309c 标准excl导入 2021-10-17 19:59:00 +08:00
zhaokaiyao@91isoft.com 7358e84b82 sql优化,保留标准类别 standSortShow 2021-10-17 19:50:47 +08:00
zhaokaiyao@91isoft.com b99983e910 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-17 18:41:13 +08:00
zhaokaiyao@91isoft.com b790264f77 导入标准信息excl导出工具 2021-10-17 18:40:53 +08:00
zhaokaiyao@91isoft.com 785ef90acd sql优化 2021-10-17 18:39:57 +08:00
zhaokaiyao@91isoft.com 33254f05f8 模块结构单元,查询 2021-10-17 16:12:23 +08:00
zhaokaiyao@91isoft.com 9b5bf72fad 文件后缀大写 2021-10-17 14:26:44 +08:00
2510220824 a68d9c9e9d add：修改pcms数据下发接口，统一访问前缀 2021-10-16 09:46:26 +08:00
2510220824 8b479fca0c add:修改用户获取权限，修改pcms数据同步 2021-10-16 09:33:48 +08:00
zhaokaiyao@91isoft.com 4e66ba832f 取消定时同步,手动同步加入白名单 2021-10-14 15:11:06 +08:00
zhaokaiyao@91isoft.com 2caec798ad Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-14 14:41:07 +08:00
zhaokaiyao@91isoft.com b33d2da29d 定时用户同步,和组织机构同步 2021-10-14 14:40:54 +08:00
yuezhihang 371f0cbfe8 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-14 09:17:17 +08:00
yuezhihang 6d63592507 清单内容 2021-10-14 09:17:07 +08:00
zhaokaiyao@91isoft.com 29ef5bafe3 commit temp 2021-10-13 15:39:37 +08:00
zhaokaiyao@91isoft.com a2866cf07e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-13 14:59:12 +08:00
zhaokaiyao@91isoft.com 503523115b 国内外标准->详情->关联模块 2021-10-13 14:48:02 +08:00
Mr.Z a15d20a8be 标准合规评估结果小眼睛查询章节号排序(新增需求根据项目名称排序) 2021-10-09 14:49:28 +08:00
Mr.Z bcc12aeb95 标准合规评估结果小眼睛查询章节号排序初改 2021-10-09 09:31:16 +08:00
zhaokaiyao@91isoft.com 36df1dc472 修改实体类属性类型 2021-10-08 14:53:28 +08:00
zhaokaiyao@91isoft.com b4ab5a8f43 comment 2021-10-08 14:52:46 +08:00
张宇欢 4def3bfe68 Merge branch 'develop_1' into 'develop_master' 
zzzDevelop 1

See merge request LiuChao/foton-slrs-system-rest!189
 2021-10-08 09:30:19 +08:00
zhaokaiyao@91isoft.com bf3412e488 海外标准导出,去除文本说明 2021-09-28 17:46:23 +08:00
zhaokaiyao@91isoft.com ff4456e3f7 标准拆分-编辑后更改标志未1 2021-09-28 17:19:24 +08:00
zhaokaiyao@91isoft.com d2870231ea 标准拆分-文件类型动态查询 2021-09-28 16:48:48 +08:00
Mr.Z aa5e7004dc Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-09-28 10:52:29 +08:00
zhaokaiyao@91isoft.com 2c4ff91c4f 部门为"null"的数据不保存 2021-09-28 10:07:29 +08:00
zhaokaiyao@91isoft.com 0a006671cc Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-28 09:04:52 +08:00
zhaokaiyao@91isoft.com 4e2278a987 机构树形排序 2021-09-28 08:58:23 +08:00
zhaokaiyao@91isoft.com f3b8466c5f 同步用户空指针 2021-09-28 08:57:55 +08:00
yuezhihang 87337c1374 查询人 接口 2021-09-27 19:47:15 +08:00
yanyizhou 58fc669581 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-27 17:26:53 +08:00
yanyizhou 4584b06a42 未符合项整改-导出 字段显示有问题 2021-09-27 17:26:48 +08:00
Mr.Z 04a07687c6 标准法规清单查询 2021-09-27 17:11:07 +08:00
Mr.Z 0630c99b0b 添加条款内容传给前端 2021-09-27 16:33:59 +08:00
yanyizhou ae1f05c000 标准法规清单-编辑-导出 删除这些字段 2021-09-27 14:52:48 +08:00
zhaokaiyao@91isoft.com 2991806086 联表查询 dicstandTextStatus 2021-09-27 14:05:51 +08:00