FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,886 Commits 1 Branch 0 Tags
34b0513275663f1eb9ec00b44c67dafe81186c28
Commit Graph
106 Commits
Author SHA1 Message Date
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
yuezhihang 39561c91d2 代码部分恢复 2021-08-18 14:38:00 +08:00
super_liu e93edf3bbb feat: 新增 convert 转换pdf子项目 2021-08-11 17:19:57 +08:00
Mr.Z f8e0ce0be1 标准征求意见流程--导出汇总单，修正存在一条数据的情况下，导出的数据应该在excel列表的第二行，目前在第三行 2021-08-08 10:17:38 +08:00
zzy 883cc97720 Update：标准解读流程新增实例 2021-07-30 11:00:36 +08:00
zzy c4e563081a update：回复配置文件 2021-07-22 17:04:55 +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
yuezhihang 2783e02b1e 链接新增bug 修复 2021-07-22 10:26:09 +08:00
Wanghong 1ad63eff70 默认变更列表 2021-07-21 16:02:50 +08:00
yuezhihang 7d890e7fcd 评估流程 2021-07-21 10:52:22 +08:00
duanwenbin a2be968da5 提交分解单列表，增加筛选条件-根据国内外标准筛选 修改一个bug，拆分解单提交功能，报错后不让入库操作 2021-07-19 09:32:23 +08:00
yinglong zhang 8aed75a8f0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-13 15:36:33 +08:00
yinglong zhang 35d86a7222 feat 未合规项整改 2021-07-13 15:36:17 +08:00
super_liu b335387242 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !21
 2021-07-11 07:49:10 +00:00
super_liu 43434a68e0 feat: 标准库 2021-07-11 15:47:02 +08:00
yinglong zhang 3b0fbb34d1 feat 改回注册中心配置 2021-07-09 11:05:46 +08:00
yuezhihang 4b8aac9bc4 标准 发布搞 2021-07-08 21:04:18 +08:00
yinglong zhang b39fda6c43 feat 改回注册中心配置 2021-07-07 09:55:52 +08:00
yinglong zhang f91b481180 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
 2021-07-07 09:54:08 +08:00
yinglong zhang 9a00280ba0 feat 改回注册中心配置 2021-07-07 09:53:29 +08:00
yuezhihang 9f856079ee 标准清单入库 bug修复 2021-07-06 20:14:34 +08:00
super_liu 51bd89fc13 Merge branch 'develop_3' into 'develop_master' 
hh Develop 3

See merge request !15
 2021-07-06 08:12:45 +00:00
yuezhihang 643ce6b932 标准清单入库流程 2021-07-05 15:45:24 +08:00
yuezhihang 2004286bca Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
 2021-07-05 15:43:45 +08:00
yuezhihang 2f462ccdb7 标准清单入库流程 2021-07-05 15:42:42 +08:00
yinglong zhang 773b75a3fe feat 合并分支 2021-07-05 15:01:40 +08:00
super_liu 75a7a90e9d Merge branch 'develop_master' into develop_3 2021-07-05 11:10:43 +08:00