 yuezhihang
|
c260cd5533
|
清单查询数据报错bug修复
|
2021-11-18 16:17:27 +08:00 |
|
|
yuezhihang
|
7485c04801
|
下载程序异常
|
2021-11-18 15:52:03 +08:00 |
|
|
yuezhihang
|
96c6202d61
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-18 10:23:39 +08:00 |
|
|
yuezhihang
|
f1175010f7
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-17 14:04:00 +08:00 |
|
|
yuezhihang
|
216a437e9e
|
Merge remote-tracking branch 'origin/origin/Three' into develop_master
|
2021-11-17 14:03:48 +08:00 |
|
|
yuezhihang
|
478cdd4c87
|
新流程的Key
|
2021-11-16 16:59:23 +08:00 |
|
|
yuezhihang
|
5fb6bd278a
|
Merge remote-tracking branch 'origin/origin/Three' into develop_master
|
2021-11-13 10:17:02 +08:00 |
|
|
yuezhihang
|
5363b35153
|
标准政策 新增去除重复
|
2021-11-12 10:27:43 +08:00 |
|
|
yuezhihang
|
7258ce26cf
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-12 09:28:00 +08:00 |
|
|
yuezhihang
|
0158e29009
|
工作组查询 修改
|
2021-11-12 09:27:49 +08:00 |
|
|
yuezhihang
|
b714156172
|
工作组查询优化
|
2021-11-11 14:13:11 +08:00 |
|
|
yuezhihang
|
333143549f
|
拆分查看页，导出程序异常白名单加入 工作组编辑
|
2021-11-10 15:52:43 +08:00 |
|
|
yuezhihang
|
139911ff51
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-10 13:52:50 +08:00 |
|
|
yuezhihang
|
2dcb38a066
|
数据库时间差问题修改
|
2021-11-10 13:52:36 +08:00 |
|
|
yuezhihang
|
6dedfa9ea4
|
工作组 新增方法
|
2021-11-10 09:32:22 +08:00 |
|
|
yuezhihang
|
80a6df7ef6
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-09 14:21:00 +08:00 |
|
|
yuezhihang
|
c4a26fa385
|
清单下拉填充bug修复
|
2021-11-09 14:20:44 +08:00 |
|
|
yuezhihang
|
e12f595891
|
查人组件 名称修改
|
2021-11-08 17:25:33 +08:00 |
|
|
yuezhihang
|
85a4b19b47
|
清单查询速度优化
|
2021-11-08 15:33:18 +08:00 |
|
|
yuezhihang
|
d970690908
|
选人组件修改
|
2021-11-08 14:48:35 +08:00 |
|
|
yuezhihang
|
049d9dbb81
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-08 13:55:44 +08:00 |
|
|
yuezhihang
|
b38cfc2a01
|
下拉填充
|
2021-11-08 13:55:35 +08:00 |
|
|
yuezhihang
|
82de89f8c2
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-11-07 19:04:35 +08:00 |
|
|
yuezhihang
|
1e61e5cfb4
|
清单查询bug
|
2021-11-07 19:00:08 +08:00 |
|
|
yuezhihang
|
438ee5ff5f
|
合规评估-标准维度查询不出来bug修复 以及导出接口白名单
|
2021-11-07 17:00:49 +08:00 |
|
|
yuezhihang
|
1b45458739
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-05 17:42:35 +08:00 |
|
|
yuezhihang
|
fbd235b655
|
工作组 相关代码 表关联以及增删改查
|
2021-11-05 17:42:27 +08:00 |
|
|
yuezhihang
|
d42d9f34f4
|
标准详情分页查询 ；老版本新接口
|
2021-11-01 17:23:09 +08:00 |
|
|
yuezhihang
|
e22aa58bd5
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-01 13:59:41 +08:00 |
|
|
yuezhihang
|
e4c5ae815f
|
标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改
|
2021-11-01 13:59:32 +08:00 |
|
|
yuezhihang
|
539cf47101
|
清单 流程回退
|
2021-10-29 14:02:47 +08:00 |
|
|
yuezhihang
|
0d18758178
|
项目评估流程标准维度-查询数据来源修复
|
2021-10-27 13:47:29 +08:00 |
|
|
yuezhihang
|
9ec34d5125
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
|
2021-10-27 13:39:58 +08:00 |
|
|
yuezhihang
|
d02b73e2dd
|
标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度
|
2021-10-27 13:39:07 +08:00 |
|
|
yuezhihang
|
a675e374bc
|
清单 流程回退
|
2021-10-27 09:38:56 +08:00 |
|
|
yuezhihang
|
23e70eba5b
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-10-25 15:10:04 +08:00 |
|
|
yuezhihang
|
59a7702e27
|
流程最新的发起Key
|
2021-10-25 15:09:55 +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 |
|
|
yuezhihang
|
87337c1374
|
查询人 接口
|
2021-09-27 19:47:15 +08:00 |
|
|
yuezhihang
|
ee340ad056
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-27 19:45:26 +08:00 |
|
|
yuezhihang
|
07a5ca6fc2
|
Merge remote-tracking branch 'origin/develop_3' into develop_master
|
2021-09-16 20:06:40 +08:00 |
|
|
yuezhihang
|
69d5a15ce4
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-16 20:06:03 +08:00 |
|
|
yuezhihang
|
4d598a76a2
|
标准解读 章节1 展示
|
2021-09-16 20:05:48 +08:00 |
|
|
yuezhihang
|
9e392bf904
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-16 15:00:23 +08:00 |
|
|
yuezhihang
|
6e88f37c28
|
项目评估流程排序问题
|
2021-09-16 15:00:14 +08:00 |
|
|
yuezhihang
|
d5081e56f7
|
Merge remote-tracking branch 'origin/develop_3' into develop_master
|
2021-09-16 09:13:34 +08:00 |
|
|
yuezhihang
|
bcf47c93e1
|
查人组件
|
2021-09-15 16:34:47 +08:00 |
|
|
yuezhihang
|
f6933d2cc3
|
程序异常解决
|
2021-09-09 19:15:07 +08:00 |
|
|
yuezhihang
|
d4dc194a79
|
清单 流程回退
|
2021-09-09 16:11:09 +08:00 |
|
|
yuezhihang
|
bbbf101055
|
征求意见排序！！
|
2021-09-09 15:31:48 +08:00 |
|
|
yuezhihang
|
721f13febc
|
数据同步
|
2021-09-09 10:04:42 +08:00 |
|
|
yuezhihang
|
5d8e14befe
|
清单 流程回退
|
2021-09-08 10:09:05 +08:00 |
|
|
yuezhihang
|
4ced2398b2
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-09-08 09:16:20 +08:00 |
|
|
yuezhihang
|
7471709e1d
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-07 09:52:18 +08:00 |
|
|
yuezhihang
|
9729d04588
|
数据同步
|
2021-09-07 09:51:59 +08:00 |
|
|
yuezhihang
|
81a65fcf36
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-07 09:22:34 +08:00 |
|
|
yuezhihang
|
02f54162d1
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-09-06 18:30:08 +08:00 |
|
|
yuezhihang
|
fa2417d51e
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-06 18:29:54 +08:00 |
|
|
yuezhihang
|
299c91d03e
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-09-06 09:12:50 +08:00 |
|
|
yuezhihang
|
92207379fc
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-04 16:43:36 +08:00 |
|
|
yuezhihang
|
b5414c7bf1
|
老数据 读取
|
2021-09-04 16:43:27 +08:00 |
|
|
yuezhihang
|
8ce701cc82
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-09-03 09:24:42 +08:00 |
|
|
yuezhihang
|
ae1c70b140
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-09-02 17:31:44 +08:00 |
|
|
yuezhihang
|
5c246ba9b4
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-02 16:44:15 +08:00 |
|
|
yuezhihang
|
5fdf3fa9ae
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-02 16:30:12 +08:00 |
|
|
yuezhihang
|
0e4d7b6a32
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-09-02 09:36:04 +08:00 |
|
|
yuezhihang
|
4277e819f2
|
因排序导致无法去重
|
2021-08-31 16:12:29 +08:00 |
|
|
yuezhihang
|
1ef143e71f
|
标准查询 标准号/标准姓名 ！！！
|
2021-08-31 10:49:04 +08:00 |
|
|
yuezhihang
|
fdd7fe18c0
|
清单查询失效问题
|
2021-08-31 10:29:29 +08:00 |
|
|
yuezhihang
|
7ad71e5e6a
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-30 17:50:50 +08:00 |
|
|
yuezhihang
|
900437039d
|
项目清单确认流程
|
2021-08-30 17:50:45 +08:00 |
|
|
yuezhihang
|
46978c9fdb
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-27 17:44:02 +08:00 |
|
|
yuezhihang
|
75888c8fa0
|
首页 结束时间正序
|
2021-08-27 17:43:56 +08:00 |
|
|
yuezhihang
|
73588cac91
|
需求 解读流程 最细条目
|
2021-08-27 15:30:24 +08:00 |
|
|
yuezhihang
|
9b9ebabe6b
|
公开征求意见
|
2021-08-27 15:30:24 +08:00 |
|
|
yuezhihang
|
653fd06d50
|
配置
|
2021-08-27 15:30:24 +08:00 |
|
|
yuezhihang
|
59f77d802c
|
首页征求意见倒序
|
2021-08-27 15:30:24 +08:00 |
|
|
yuezhihang
|
7ff86124b7
|
首页 征求意见倒序排序
|
2021-08-27 15:30:24 +08:00 |
|
|
yuezhihang
|
003315dde8
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-27 14:44:07 +08:00 |
|
|
yuezhihang
|
9185ef2b6a
|
需求 解读流程 最细条目
|
2021-08-27 14:43:47 +08:00 |
|
|
yuezhihang
|
638a988a9d
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-27 09:23:22 +08:00 |
|
|
yuezhihang
|
6aeb9b91ac
|
公开征求意见
|
2021-08-26 14:25:12 +08:00 |
|
|
yuezhihang
|
7b940f7c91
|
配置
|
2021-08-26 13:56:12 +08:00 |
|
|
yuezhihang
|
6c94bcb070
|
首页征求意见倒序
|
2021-08-26 13:55:21 +08:00 |
|
|
yuezhihang
|
120ee599b7
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-26 13:54:35 +08:00 |
|
|
yuezhihang
|
19ed562068
|
首页 征求意见倒序排序
|
2021-08-26 13:54:24 +08:00 |
|
|
yuezhihang
|
ca84264193
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-26 09:42:57 +08:00 |
|
|
yuezhihang
|
65a7e634d4
|
分界单进入之前先删除
|
2021-08-24 17:14:20 +08:00 |
|
|
yuezhihang
|
78dbd37f03
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
|
2021-08-24 15:34:27 +08:00 |
|
|
yuezhihang
|
27e72dca2e
|
征求意见 数据
|
2021-08-20 17:49:34 +08:00 |
|
|
yuezhihang
|
e4c66d74a2
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-20 15:20:54 +08:00 |
|
|
yuezhihang
|
dcfedac4bf
|
标准征求意见流程汇总
|
2021-08-20 15:20:33 +08:00 |
|
|
yuezhihang
|
019ca93736
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-19 16:51:11 +08:00 |
|
|
yuezhihang
|
66edfd1afc
|
清单 附件回显
|
2021-08-19 16:51:03 +08:00 |
|
|
yuezhihang
|
b7589984e8
|
清单 流程回退
|
2021-08-19 10:51:37 +08:00 |
|
|
yuezhihang
|
7d18b3ff7c
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-19 10:41:20 +08:00 |
|
|
yuezhihang
|
cdb3a9ccd4
|
bug修复 !!!
|
2021-08-19 09:25:29 +08:00 |
|
|
yuezhihang
|
508c292200
|
配置文件
|
2021-08-18 15:15:06 +08:00 |
|
|
yuezhihang
|
af1ffe9313
|
解读入库
|
2021-08-18 14:44:27 +08:00 |
|