Commit Graph
82 Commits
Author SHA1 Message Date
zj 2302a13901 解决冲突 2021-12-17 10:55:36 +08:00
super_liu ddbedc1b28 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!293
2021-12-16 18:18:40 +08:00
super_liu 90d6c0d4cf feat: There is no way the, 2021-12-16 18:13:17 +08:00
yuezhihang a5e00ef286 公开征求意见以及流程部分功能修复 2021-12-16 15:33:21 +08:00
yuezhihang 13e373f148 新流程发起接口 2021-12-16 11:03:07 +08:00
super_liu 121dc4b965 feat: There is no way the, 2021-12-15 09:08:41 +08:00
super_liu 1e83fad8bd feat: There is no way the 2021-12-14 21:56:42 +08:00
super_liu 6b8868a9b1 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss process

See merge request LiuChao/foton-slrs-system-rest!280
2021-12-14 21:24:06 +08:00
super_liu 7521af3dd0 feat: There is no way the, buss process 2021-12-14 21:18:43 +08:00
yuezhihang c87d843055 征求意见流程新---!!!! 2021-12-13 14:15:44 +08:00
Superman_Main 3156acafd2 feat: There is no way the, buss 2021-12-10 10:42:13 +08:00
yuezhihang 1edd95bccc Ocr部分bug 和工作组部分bug修复 2021-12-07 15:19:55 +08:00
yuezhihang 51e67d4440 删除草稿接口 api/lawss/activiti/delCG 2021-12-05 15:50:46 +08:00
Superman_Main 0d43dde5f6 feat: There is no way the, 2021-11-29 16:14:38 +08:00
yuezhihang 0f8bc78441 查询代办的新接口 目前只有标准号 标准名称 和 标准类型 的查询 2021-11-23 17:02:16 +08:00
zhaokaiyao@91isoft.com bd0ace0fcb Merge branch 'develop_master' into develop_3 2021-11-19 14:29:43 +08:00
zhaokaiyao@91isoft.com 7f620c68f6 政策重点认证事业部 风险项入库 2021-11-19 14:25:59 +08:00
zhaokaiyao@91isoft.com e1037c73f1 政策重点认证事业部 风险项入库 2021-11-17 10:36:40 +08:00
yuezhihang 478cdd4c87 新流程的Key 2021-11-16 16:59:23 +08:00
Kevin b74db49da3 Merge remote-tracking branch 'origin/develop_master' into origin/Three 2021-11-10 14:13:12 +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 f0ed2b769d 流程详情导出时的审批意见问题 2021-11-07 15:51:34 +08:00
zhaokaiyao@91isoft.com f9a39a330b 重点认证标准/政策合规性项目审核流程纳入问题管控 2021-11-05 17:50:54 +08:00
yuezhihang fbd235b655 工作组 相关代码 表关联以及增删改查 2021-11-05 17:42:27 +08:00
zhaokaiyao@91isoft.com ff76f0457d 政策征求意见导出 2021-11-04 15:21:07 +08:00
Kevin 31f9790e61 zcr:标准化活动会后流程 2021-11-04 10:12:51 +08:00
zhaokaiyao@91isoft.com 60bd72ce14 Merge remote-tracking branch 'origin/develop_master' into develop_3
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
2021-11-03 13:51:29 +08:00
zhaokaiyao@91isoft.com f87438832f 政策征求意见, 认证重点法规/政策 流程 2021-11-03 10:29:32 +08:00
super_liu cab90f06ee feat: There is no way the,Laws 2021-11-01 17:59:24 +08:00
super_liu f54c8ea63b feat: There is no way the,laws 2021-11-01 09:43:13 +08:00
yuezhihang 539cf47101 清单 流程回退 2021-10-29 14:02:47 +08:00
yuezhihang a675e374bc 清单 流程回退 2021-10-27 09:38:56 +08:00
yuezhihang 59a7702e27 流程最新的发起Key 2021-10-25 15:09:55 +08:00
super_liu 08a68ced24 feat: There is no way the 2021-10-12 13:36:04 +08:00
super_liu 3c3a199a1a feat: There is no way the idm and oa 2021-10-11 17:45:30 +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
super_liu 5fc16766d9 feat: There is no way the 2021-09-30 18:09:40 +08:00
super_liu fc2664079d feat: There is no way the 2021-09-29 18:03:32 +08:00
Mr.Z 35f49e1528 导出排序(按照章节号从小到大) 2021-09-27 09:43:27 +08:00
Mr.Z 108b718091 导出排序(按照章节号从小到大) 2021-09-26 17:50:48 +08:00
Mr.Z b064503b3c 导出排序(按照章节号从小到大) 2021-09-26 17:33:16 +08:00
super_liu 97ebfb6f6a feat: There is no way the 2021-09-16 14:56:39 +08:00
Mr.Z 04dc576644 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:31:28 +08:00
Mr.Z 5d56dd4151 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:29:23 +08:00
super_liu f8de6d895f feat: There is no way the 2021-09-02 15:21:45 +08:00
yuezhihang 900437039d 项目清单确认流程 2021-08-30 17:50:45 +08:00
yuezhihang 7b940f7c91 配置 2021-08-26 13:56:12 +08:00
yuezhihang 19ed562068 首页 征求意见倒序排序 2021-08-26 13:54:24 +08:00
Mr.Z a828f41d20 征求意见流程导出bug修改~~ 2021-08-25 15:16:14 +08:00
yuezhihang 508c292200 配置文件 2021-08-18 15:15:06 +08:00