Commit Graph

2626 Commits

Author SHA1 Message Date
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
dinggang c4e43ff5ef 资金大屏统计修改 2022-12-05 15:55:44 +08:00