Commit Graph

2601 Commits

Author SHA1 Message Date
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