FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,019 Commits 1 Branch 0 Tags
23b81d878c4561a6d4098c10520be9b284db8567
Commit Graph
582 Commits
Author SHA1 Message Date
yuezhihang b38cfc2a01 下拉填充 2021-11-08 13:55:35 +08:00
yuezhihang 438ee5ff5f 合规评估-标准维度查询不出来bug修复 以及导出接口白名单 2021-11-07 17:00:49 +08:00
super_liu 8b401b8832 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!222
 2021-11-07 16:49:22 +08:00
zhaokaiyao@91isoft.com 541c93a5bb 标准号,标准名称分开搜索 2021-11-07 14:53:01 +08:00
super_liu 720a8b45d9 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!220
 2021-11-06 23:19:18 +08:00
super_liu 8b12a63925 feat: There is no way the, 2021-11-06 23:17:29 +08:00
yuezhihang fbd235b655 工作组 相关代码 表关联以及增删改查 2021-11-05 17:42:27 +08:00
super_liu 7e1cc917dd Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!215
 2021-11-03 13:05:37 +08:00
super_liu 869bcdbad8 feat: There is no way the 2021-11-03 13:00:33 +08:00
super_liu 3cd3266899 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!214
 2021-11-01 18:03:47 +08:00
super_liu cab90f06ee feat: There is no way the,Laws 2021-11-01 17:59:24 +08:00
yuezhihang e4c5ae815f 标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改 2021-11-01 13:59:32 +08:00
super_liu 1928ae8868 Merge branch 'develop_master' into develop_migration 2021-10-30 00:55:32 +08:00
super_liu 831f8d321a feat: There is no way the 2021-10-29 23:53:33 +08:00
super_liu 62c18594db feat: There is no way the Laws 2021-10-28 18:10:31 +08:00
yuezhihang d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 2021-10-27 13:39:07 +08:00
super_liu 89b4bfdd8d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!209
 2021-10-22 18:02:44 +08:00
super_liu 3cd41c45d7 feat: There is no way the, TO optimize the query 2021-10-22 17:53:11 +08:00
super_liu 1918e0da78 feat: There is no way the, TO optimize the query 2021-10-22 17:03:29 +08:00
super_liu 9eff2340a2 feat: There is no way the, TO optimize the query 2021-10-22 15:50:07 +08:00
zhaokaiyao@91isoft.com ed1762a7ec 标准发布日期查询 2021-10-21 18:25:14 +08:00
zhaokaiyao@91isoft.com 0ee4f63614 项目清单->项目经理 2021-10-21 13:51:27 +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 59c8f0f60b add:优化机构管理人员查询，不传机构就查全部 2021-10-19 16:18:11 +08:00
zhaokaiyao@91isoft.com acbece6b2a 机构树形结构 不采用用递归查询数据库 2021-10-18 16:46:24 +08:00
zhaokaiyao@91isoft.com 7358e84b82 sql优化,保留标准类别 standSortShow 2021-10-17 19:50:47 +08:00
zhaokaiyao@91isoft.com 785ef90acd sql优化 2021-10-17 18:39:57 +08:00
yuezhihang 6d63592507 清单内容 2021-10-14 09:17:07 +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 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
yuezhihang 87337c1374 查询人 接口 2021-09-27 19:47:15 +08:00
Mr.Z 04a07687c6 标准法规清单查询 2021-09-27 17:11:07 +08:00
Mr.Z 0630c99b0b 添加条款内容传给前端 2021-09-27 16:33:59 +08:00
zhaokaiyao@91isoft.com 2991806086 联表查询 dicstandTextStatus 2021-09-27 14:05:51 +08:00
zhaokaiyao@91isoft.com ce7812e704 把 standtextStatusShow改为了standTextStatusShow 2021-09-27 13:54:14 +08:00
zhaokaiyao@91isoft.com fd2d58c25f 添加了连接查询文本状态显示值 2021-09-27 10:44:38 +08:00
zhaokaiyao@91isoft.com 447d56231a group by中添加字段dicstandNature.DIC_TYPE_NAME 2021-09-27 10:33:37 +08:00
zhaokaiyao@91isoft.com d9d5aeb284 标准导出 2021-09-27 10:18:26 +08:00
Mr.Z 22027d9e7c Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-26 13:48:47 +08:00
yanyizhou 30c2b5de44 配置管理-机构管理 输入检索条件 查询 有12条 但是显示25条 25条是所有的数据数 2021-09-26 10:34:07 +08:00
zhaokaiyao@91isoft.com 5d1e39fa32 分解单->关联条款 2021-09-23 01:12:51 +08:00
zhaokaiyao@91isoft.com d4a293cbef 标准详情->分解单->排序split_pid函数 2021-09-22 16:26:02 +08:00
zhaokaiyao@91isoft.com 7bc2d8124a 首页->标准发布->实施日期和发布日期比较时的日期格式 2021-09-17 09:31:52 +08:00
zhaokaiyao@91isoft.com e7e3848108 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-16 20:04:09 +08:00
zhaokaiyao@91isoft.com fe0a0f7dbe 国内外标准 实施日期排序 程序异常 group by问题 2021-09-16 20:03:40 +08:00
zhaokaiyao@91isoft.com ccf7d32945 首页标准发布 只查询文本状态为即将实施的数据 2021-09-16 19:27:36 +08:00