wangliwen
|
8884612800
|
....
|
2022-12-16 15:53:50 +08:00 |
|
wangliwen
|
95b17b089b
|
Merge branch 'dev'
|
2022-12-16 15:09:33 +08:00 |
|
wangliwen
|
5db160ca18
|
...
|
2022-12-16 15:09:26 +08:00 |
|
wangliwen
|
1a4505cefc
|
Merge branch 'dev'
|
2022-12-16 15:07:49 +08:00 |
|
wangliwen
|
9769701093
|
...
|
2022-12-16 15:07:42 +08:00 |
|
wangliwen
|
35aded9760
|
Merge branch 'dev'
|
2022-12-16 14:56:08 +08:00 |
|
wangliwen
|
2e5677486a
|
...
|
2022-12-16 14:56:00 +08:00 |
|
wangliwen
|
7795d59223
|
Merge branch 'dev'
|
2022-12-16 14:54:25 +08:00 |
|
wangliwen
|
9e37adfceb
|
过滤后端 HIQDUCS-666
|
2022-12-16 14:54:13 +08:00 |
|
wangliwen
|
ea7027af3b
|
Merge branch 'dev'
|
2022-12-16 11:46:38 +08:00 |
|
wangliwen
|
94260ff02d
|
屮
|
2022-12-16 11:46:31 +08:00 |
|
wangliwen
|
f9d893c8e7
|
...
|
2022-12-16 11:45:59 +08:00 |
|
wangliwen
|
da4c1b88ed
|
Merge branch 'dev'
|
2022-12-16 10:49:33 +08:00 |
|
wangliwen
|
0f4d2c0bd0
|
/resource/page 接口支持传部门id过滤
|
2022-12-16 10:49:26 +08:00 |
|
wangliwen
|
3f5c12bc2c
|
Merge branch 'dev'
|
2022-12-16 10:02:29 +08:00 |
|
wangliwen
|
0aede1e910
|
能力申请市局使用缓存线程池
|
2022-12-16 10:02:21 +08:00 |
|
wangliwen
|
de0884b76f
|
Merge branch 'dev'
|
2022-12-16 09:42:10 +08:00 |
|
wangliwen
|
859edc9864
|
...
|
2022-12-16 09:41:55 +08:00 |
|
wangliwen
|
321bf20f4b
|
Merge branch 'dev'
|
2022-12-15 17:03:44 +08:00 |
 dinggang
|
81fe70aa42
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-15 16:45:47 +08:00 |
|
dinggang
|
d403b27c5f
|
..
|
2022-12-15 16:43:19 +08:00 |
|
wangliwen
|
91651c7e1d
|
Merge branch 'dev'
|
2022-12-15 14:45:03 +08:00 |
|
wangliwen
|
232c160abe
|
npe
|
2022-12-15 14:44:55 +08:00 |
|
wangliwen
|
a9e8c8319c
|
Merge branch 'dev'
|
2022-12-15 14:27:40 +08:00 |
|
wangliwen
|
db11899094
|
屮
|
2022-12-15 14:27:33 +08:00 |
|
wangliwen
|
c2596cf732
|
Merge branch 'dev'
|
2022-12-15 13:52:44 +08:00 |
|
wangliwen
|
274cbd9de8
|
...
|
2022-12-15 13:52:34 +08:00 |
|
wangliwen
|
81847e3d6e
|
Merge branch 'dev'
|
2022-12-15 12:33:36 +08:00 |
|
wangliwen
|
022b0d15e3
|
...
|
2022-12-15 12:33:28 +08:00 |
|
wangliwen
|
6632b7fecb
|
Merge branch 'dev'
|
2022-12-15 09:58:03 +08:00 |
|
wangliwen
|
889f59c7ae
|
...
|
2022-12-15 09:57:49 +08:00 |
|
wangliwen
|
e10a025b48
|
Merge branch 'dev'
|
2022-12-14 16:11:02 +08:00 |
|
wangliwen
|
0b654e53f1
|
...
|
2022-12-14 16:06:06 +08:00 |
|
wangliwen
|
c5818df312
|
Merge branch 'dev'
|
2022-12-14 15:44:58 +08:00 |
|
wangliwen
|
a495fff99d
|
resourceSelectTotal 缓存失败的处理
|
2022-12-14 15:44:27 +08:00 |
|
wangliwen
|
f7401dbaca
|
Merge branch 'dev'
|
2022-12-14 15:26:17 +08:00 |
|
wangliwen
|
6fb4457625
|
...屮
|
2022-12-14 15:26:07 +08:00 |
|
wangliwen
|
b3af80bb0a
|
Merge branch 'dev'
|
2022-12-14 15:17:14 +08:00 |
|
wangliwen
|
99df97a174
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-14 15:16:28 +08:00 |
|
dinggang
|
38bd349887
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-14 15:15:17 +08:00 |
|
dinggang
|
2a00f826a8
|
npe
|
2022-12-14 15:14:51 +08:00 |
|
wangliwen
|
fd680542a5
|
...
|
2022-12-14 15:14:34 +08:00 |
|
wangliwen
|
8459f2acc9
|
Merge branch 'dev'
|
2022-12-14 14:24:24 +08:00 |
|
wangliwen
|
ffae066127
|
500
|
2022-12-14 14:24:15 +08:00 |
|
wangliwen
|
b8bf1e62f9
|
Merge branch 'dev'
|
2022-12-14 13:58:52 +08:00 |
|
wangliwen
|
9b982cadcc
|
selectTotal 缓存
|
2022-12-14 13:58:44 +08:00 |
|
wangliwen
|
edb5c683f8
|
Merge branch 'dev'
|
2022-12-14 11:46:16 +08:00 |
|
dinggang
|
fbeadb6ba3
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
# renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql
|
2022-12-14 11:39:51 +08:00 |
|
dinggang
|
6e1bea68ff
|
1.赋能场景需求变更
2.能力统计逻辑修改
3.sql
|
2022-12-14 11:38:36 +08:00 |
|
wangliwen
|
928237e8e4
|
Merge branch 'dev'
|
2022-12-14 11:32:45 +08:00 |
|
wangliwen
|
5dc4b1e482
|
分页数量不正确
|
2022-12-14 11:32:34 +08:00 |
|
wangliwen
|
88ec021412
|
Merge branch 'dev'
|
2022-12-14 10:48:16 +08:00 |
|
wangliwen
|
f7e739ea7d
|
获取具备审核权限人员时支持过滤已加入审核组人员
|
2022-12-14 10:48:01 +08:00 |
|
wangliwen
|
0a69c619c8
|
Merge branch 'dev'
|
2022-12-13 17:56:26 +08:00 |
|
wangliwen
|
d177a351ac
|
...
|
2022-12-13 17:56:17 +08:00 |
|
wangliwen
|
6f3096556b
|
Merge branch 'dev'
|
2022-12-13 17:11:47 +08:00 |
|
wangliwen
|
35d08fe63f
|
增加已在审核组内的审核组名称与去重审核权限人员
|
2022-12-13 17:11:40 +08:00 |
|
wangliwen
|
2ffe4948cf
|
Merge branch 'dev'
|
2022-12-13 16:45:21 +08:00 |
|
wangliwen
|
d9df602910
|
审核组外围支持接口
|
2022-12-13 16:45:12 +08:00 |
|
wangliwen
|
151d61d04a
|
Merge branch 'dev'
|
2022-12-13 13:33:58 +08:00 |
|
wangliwen
|
4c935c6115
|
...
|
2022-12-13 13:33:51 +08:00 |
|
wangliwen
|
11ed5a0ba7
|
Merge branch 'dev'
|
2022-12-13 11:33:12 +08:00 |
|
wangliwen
|
7418814fbd
|
已办、待办 拥有运维管理员权限用户才返回会客厅相关数据
|
2022-12-13 11:33:00 +08:00 |
|
wangliwen
|
34ea6630f3
|
Merge branch 'dev'
|
2022-12-13 11:00:26 +08:00 |
|
wangliwen
|
fafd6f48cd
|
...
|
2022-12-13 11:00:19 +08:00 |
|
wangliwen
|
eb5c316eab
|
Merge branch 'dev'
|
2022-12-13 10:22:56 +08:00 |
|
wangliwen
|
2994ebde69
|
附件名称字段
|
2022-12-13 10:22:49 +08:00 |
|
wangliwen
|
6f036e0d64
|
Merge branch 'dev'
|
2022-12-13 09:54:50 +08:00 |
|
wangliwen
|
1565a9ca70
|
能力需求增加附件名称
|
2022-12-13 09:54:38 +08:00 |
|
wangliwen
|
ba05b09ec6
|
Merge branch 'dev'
|
2022-12-13 09:15:52 +08:00 |
|
wangliwen
|
d009afa030
|
sql调整
|
2022-12-13 09:15:44 +08:00 |
|
wangliwen
|
401b270a71
|
Merge branch 'dev'
|
2022-12-13 09:04:59 +08:00 |
|
dinggang
|
1c143be715
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
|
2022-12-13 03:13:45 +08:00 |
|
dinggang
|
aa6f1f55d5
|
..
|
2022-12-13 03:07:40 +08:00 |
|
wangliwen
|
10d9f4428a
|
Merge branch 'dev'
|
2022-12-12 17:20:21 +08:00 |
|
wangliwen
|
e3184382fc
|
协作组互助审核通过时不发分配通知
|
2022-12-12 17:20:13 +08:00 |
|
wangliwen
|
5468ce701b
|
Merge branch 'dev'
|
2022-12-12 17:06:30 +08:00 |
|
wangliwen
|
5f2b55d975
|
...恢复
|
2022-12-12 17:06:21 +08:00 |
|
wangliwen
|
b8565cb9d1
|
Merge branch 'dev'
|
2022-12-12 16:55:41 +08:00 |
|
wangliwen
|
4bdebca7d7
|
调整协作组内审核人不更改
|
2022-12-12 16:55:33 +08:00 |
|
wangliwen
|
1a252a3cdb
|
Merge branch 'dev'
|
2022-12-12 16:38:45 +08:00 |
|
wangliwen
|
d9f600f046
|
我的待办数量中加入协作组内数量
|
2022-12-12 16:38:13 +08:00 |
|
wangliwen
|
c883aaf8d2
|
...
|
2022-12-12 16:21:23 +08:00 |
|
wangliwen
|
8d97144826
|
Merge branch 'dev'
|
2022-12-12 15:57:22 +08:00 |
|
wangliwen
|
b2f03e4218
|
流程涉及的审核协作组逻辑
|
2022-12-12 15:57:11 +08:00 |
|
wangliwen
|
967ab8642a
|
Merge branch 'dev'
|
2022-12-12 10:13:01 +08:00 |
|
wangliwen
|
31abb2e28c
|
屮
|
2022-12-12 10:12:53 +08:00 |
|
wangliwen
|
3eeee80aaf
|
Merge branch 'dev'
|
2022-12-12 10:04:43 +08:00 |
|
wangliwen
|
3147d1ea2e
|
..
|
2022-12-12 10:04:34 +08:00 |
|
wangliwen
|
eb97a398fe
|
sql文件调整
|
2022-12-12 10:04:25 +08:00 |
|
wangliwen
|
66e0e637d3
|
Merge branch 'dev'
|
2022-12-12 09:54:49 +08:00 |
|
wangliwen
|
871862bd00
|
...
|
2022-12-12 09:54:39 +08:00 |
|
wangliwen
|
82ec4b4da5
|
创建流程审核组成员表
|
2022-12-12 09:54:26 +08:00 |
|
wangliwen
|
cfddb4e1f8
|
Merge branch 'dev'
|
2022-12-12 09:05:03 +08:00 |
|
dinggang
|
2059a69538
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-12-12 08:42:19 +08:00 |
|
dinggang
|
1e55d1eade
|
..
|
2022-12-12 08:37:22 +08:00 |
|
wangliwen
|
1663277e9c
|
Merge branch 'dev'
|
2022-12-10 20:28:56 +08:00 |
|
wangliwen
|
5c83bfa1da
|
fix npe
|
2022-12-10 20:28:46 +08:00 |
|
wangliwen
|
3228cbd926
|
Merge branch 'dev'
|
2022-12-10 20:18:23 +08:00 |
|
wangliwen
|
035575b45d
|
npe
|
2022-12-10 20:18:14 +08:00 |
|
wangliwen
|
c43b7d9225
|
Merge branch 'dev'
|
2022-12-10 19:59:16 +08:00 |
|
wangliwen
|
439ed6aa61
|
政务云访问异常时统计
|
2022-12-10 19:59:06 +08:00 |
|
dinggang
|
3109a28f06
|
新增依赖
|
2022-12-10 19:22:50 +08:00 |
|
wangliwen
|
fbb8afce2c
|
Merge branch 'dev'
|
2022-12-10 17:03:22 +08:00 |
|
wangliwen
|
e266885230
|
...
|
2022-12-10 17:03:12 +08:00 |
|
wangliwen
|
4af9bd90e4
|
Merge branch 'dev'
|
2022-12-10 16:46:26 +08:00 |
|
wangliwen
|
180cfcf52c
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-10 16:46:11 +08:00 |
|
wangliwen
|
72339c1f9c
|
异步处理待办任务内详情，大幅减少计算时间
|
2022-12-10 16:45:56 +08:00 |
|
dinggang
|
e331fffaa5
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-10 16:10:45 +08:00 |
|
dinggang
|
a52ecdaeca
|
1.云资源和云视频申请查询接口
2.ucs与浪潮部门对应表
|
2022-12-10 16:10:20 +08:00 |
|
wangliwen
|
5b86609369
|
Merge branch 'dev'
|
2022-12-10 16:10:05 +08:00 |
|
wangliwen
|
14bbde1103
|
配置是否开启恩科组会功能
|
2022-12-10 16:09:53 +08:00 |
|
wangliwen
|
1f72d75871
|
Merge branch 'dev'
|
2022-12-10 15:46:12 +08:00 |
|
wangliwen
|
ac188e41eb
|
增加审核任务是否为审核组内其它组员任务
|
2022-12-10 15:46:04 +08:00 |
|
wangliwen
|
1f549b5659
|
Merge branch 'dev'
|
2022-12-10 15:02:45 +08:00 |
|
wangliwen
|
07c73216dd
|
...
|
2022-12-10 15:00:43 +08:00 |
|
wangliwen
|
07bb9d1ed9
|
使用activiti NativeTaskQuery查询待办分页，为审核组互助审核做查询基础
|
2022-12-10 15:00:28 +08:00 |
|
wangliwen
|
c59d6ca71c
|
Merge branch 'dev'
|
2022-12-09 14:27:50 +08:00 |
|
wangliwen
|
80cbecc6e0
|
公告修改接口
|
2022-12-09 14:27:40 +08:00 |
|
wangliwen
|
cb9fa3f0ab
|
Merge branch 'dev'
|
2022-12-09 11:42:37 +08:00 |
|
wangliwen
|
4425851bed
|
...
|
2022-12-09 11:42:30 +08:00 |
|
wangliwen
|
0c9f3247c1
|
Merge branch 'dev'
|
2022-12-09 11:32:04 +08:00 |
|
wangliwen
|
511772b051
|
...
|
2022-12-09 11:31:55 +08:00 |
|
wangliwen
|
8cac26fbc2
|
Merge branch 'dev'
|
2022-12-09 10:44:22 +08:00 |
|
wangliwen
|
e229eacfdb
|
工作台 已办任务加入会客厅已办数量
|
2022-12-09 10:44:13 +08:00 |
|
wangliwen
|
2d12110d7c
|
Merge branch 'dev'
|
2022-12-09 10:19:33 +08:00 |
|
wangliwen
|
e490ff7a25
|
npe
|
2022-12-09 10:19:24 +08:00 |
|
wangliwen
|
a1279b5085
|
Merge branch 'dev'
|
2022-12-09 09:36:04 +08:00 |
|
wangliwen
|
d56d2aa99b
|
fix 557
|
2022-12-09 09:35:56 +08:00 |
|
wangliwen
|
5d14228215
|
Merge branch 'dev'
|
2022-12-08 16:32:02 +08:00 |
|
wangliwen
|
66e13c0f50
|
减少一些日志输出
|
2022-12-08 16:11:01 +08:00 |
|
wangliwen
|
91eea8e787
|
Merge branch 'dev'
|
2022-12-08 16:05:06 +08:00 |
|
wangliwen
|
6c636ce311
|
催办配置失效问题
|
2022-12-08 16:04:56 +08:00 |
|
wangliwen
|
6e2ba70c84
|
Merge branch 'dev'
|
2022-12-08 09:20:18 +08:00 |
|
wangliwen
|
c8a5e0450c
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-12-08 09:20:08 +08:00 |
|
wangliwen
|
63c979057f
|
fix 474
|
2022-12-08 09:19:59 +08:00 |
|
dinggang
|
aa31a7bd43
|
1.浪潮政务云视频和云资源申请相关接口
2.全局搜索统计增加政务云资源搜索结果
3.后台管理-能力统计-能力上架统计-明细页面SQL调整
|
2022-12-08 09:12:24 +08:00 |
|
wangliwen
|
6c5559e0ab
|
Merge branch 'dev'
|
2022-12-06 18:09:12 +08:00 |
|
dinggang
|
1289bfc619
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
|
2022-12-06 18:08:42 +08:00 |
|
dinggang
|
948c1d2d55
|
1.全局搜索增加政务云资源搜索结果
2.后台管理-通知管理-我的通知增加按通知类型筛选
3.对接浪潮政务云资源和云视频
|
2022-12-06 18:01:51 +08:00 |
|
wangliwen
|
9d0b6d4d4c
|
Merge branch 'dev'
|
2022-12-06 17:57:29 +08:00 |
|
wangliwen
|
b6de83347a
|
...
|
2022-12-06 17:57:17 +08:00 |
|
wangliwen
|
c57003e31c
|
Merge branch 'dev'
|
2022-12-06 10:06:41 +08:00 |
|
wangliwen
|
e1abfa6e5d
|
批量驳回接口
|
2022-12-06 10:06:31 +08:00 |
|
wangliwen
|
9874820779
|
Merge branch 'dev'
|
2022-12-05 16:59:41 +08:00 |
|
wangliwen
|
9832a37e2c
|
...
|
2022-12-05 16:59:30 +08:00 |
|
wangliwen
|
dbc8759760
|
Merge branch 'dev'
|
2022-12-05 16:09:08 +08:00 |
|
wangliwen
|
386478aa76
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-12-05 16:08:56 +08:00 |
|
wangliwen
|
19e6f7d5a4
|
能力申请每个任务节点加入催办信息与状态
|
2022-12-05 16:08:46 +08:00 |
|
dinggang
|
b2b21f6442
|
漏提交
|
2022-12-05 15:56:27 +08:00 |