wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,913 Commits 6 Branches 12 Tags 25 MiB
Commit Graph

2797 Commits

Author SHA1 Message Date
wangliwen 6632b7fecb Merge branch 'dev' 2022-12-15 09:58:03 +08:00
wangliwen 889f59c7ae ... 2022-12-15 09:57:49 +08:00
wangliwen 09f74c6a18 Merge branch 'master' into docker_package 2022-12-14 16:11:10 +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 0dc280f9a5 Merge branch 'master' into docker_package 2022-12-14 15:45: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 cc0b06a133 Merge branch 'master' into docker_package 2022-12-14 15:26: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 713d005267 Merge branch 'master' into docker_package 2022-12-14 15:17:24 +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 51e1965692 Merge branch 'master' into docker_package 2022-12-14 14:24:31 +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 aa0960c3c1 Merge branch 'master' into docker_package 2022-12-14 13:58:59 +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 38e0d6588d Merge branch 'master' into docker_package 2022-12-14 11:46:23 +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 bc238cf39e Merge branch 'master' into docker_package 2022-12-14 11:32:55 +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 c831c2dd80 Merge branch 'master' into docker_package 2022-12-14 10:48:31 +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 ffdb41c662 Merge branch 'master' into docker_package 2022-12-13 17:56:33 +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 b7ca062f61 Merge branch 'master' into docker_package 2022-12-13 17:11:54 +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 fb990f0791 Merge branch 'master' into docker_package 2022-12-13 16:45:28 +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 1918365fc4 Merge branch 'master' into docker_package 2022-12-13 13:34:11 +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 d258a875ae Merge branch 'master' into docker_package 2022-12-13 11:34:58 +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 0c6028ec75 Merge branch 'master' into docker_package 2022-12-13 11:00:40 +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 aec5088067 Merge branch 'master' into docker_package 2022-12-13 10:23:03 +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 a85552322e Merge branch 'master' into docker_package 2022-12-13 09:54:57 +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 5d9931a6d7 Merge branch 'master' into docker_package 2022-12-13 09:16:01 +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 036c05f15b Merge branch 'master' into docker_package 2022-12-13 09:05:10 +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 077237c285 Merge branch 'master' into docker_package 2022-12-12 17:20:27 +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 819e0bc441 Merge branch 'master' into docker_package 2022-12-12 17:06:37 +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 6d2ba4a421 Merge branch 'master' into docker_package 2022-12-12 16:55:48 +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 6425454bec Merge branch 'master' into docker_package 2022-12-12 16:38:53 +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 3950ab6936 Merge branch 'master' into docker_package 2022-12-12 15:57:30 +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 0e4e1b100c Merge branch 'master' into docker_package 2022-12-12 10:13:08 +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 8b29639e7c Merge branch 'master' into docker_package 2022-12-12 10:04:50 +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 5858237193 Merge branch 'master' into docker_package 2022-12-12 09:54:58 +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 33da1c1e17 Merge branch 'master' into docker_package 2022-12-12 09:05:11 +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 2dca64b91f Merge branch 'master' into docker_package 2022-12-10 20:29:04 +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 5c65ca315d Merge branch 'master' into docker_package 2022-12-10 20:18:30 +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 4f563fa48a Merge branch 'master' into docker_package 2022-12-10 19:59:27 +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 2ee00e0d97 Merge branch 'master' into docker_package 2022-12-10 17:03:29 +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 3d50a6dd05 Merge branch 'master' into docker_package 2022-12-10 16:46:37 +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 4bc0401a46 Merge branch 'master' into docker_package 2022-12-10 16:10:15 +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 179830ff16 Merge branch 'master' into docker_package 2022-12-10 15:46:20 +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 7106e0813b Merge branch 'master' into docker_package 2022-12-10 15:03:02 +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 b81c11f011 Merge branch 'master' into docker_package 2022-12-09 14:28:02 +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 cc51c7e3b5 Merge branch 'master' into docker_package 2022-12-09 11:42:43 +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 ff9ebc6582 Merge branch 'master' into docker_package 2022-12-09 11:32:11 +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 101e986917 Merge branch 'master' into docker_package 2022-12-09 10:44:29 +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 c09d461ffe Merge branch 'master' into docker_package 2022-12-09 10:19:42 +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 f622f3dedd Merge branch 'master' into docker_package 2022-12-09 09:36:12 +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 6c88386ae0 Merge branch 'master' into docker_package 2022-12-08 16:32:12 +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 8ee75c8e78 Merge branch 'master' into docker_package 2022-12-08 16:05:14 +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 3195fdb885 Merge branch 'master' into docker_package 2022-12-08 09:20:29 +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 d2b1cb4114 Merge branch 'master' into docker_package 2022-12-06 18:09:22 +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 c03a788bda Merge branch 'master' into docker_package 2022-12-06 17:57:36 +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 f3f911e726 Merge branch 'master' into docker_package 2022-12-06 10:06:50 +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 fa0c9f0f61 Merge branch 'master' into docker_package 2022-12-05 16:59:48 +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 5e23978366 Merge branch 'master' into docker_package 2022-12-05 16:09:15 +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
wangliwen 4d6b3552db Merge branch 'master' into docker_package 2022-12-05 15:26:31 +08:00
wangliwen b5995b1d26 Merge branch 'dev' 2022-12-05 15:26:22 +08:00
wangliwen 7e332201c4 从未催办过的任务 判断是否已超过预置天数 2022-12-05 15:26:13 +08:00
wangliwen 6bc3e01863 Merge branch 'master' into docker_package 2022-12-05 14:17:45 +08:00
wangliwen 1bb9540e86 Merge branch 'dev' 2022-12-05 14:17:35 +08:00
wangliwen 9e618c75cc 催办信息保存前判断 2022-12-05 14:17:27 +08:00
wangliwen 54d0ca1ecf Merge branch 'master' into docker_package 
# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
 2022-12-05 11:59:54 +08:00
wangliwen 7ecfad7e81 Merge branch 'dev' 2022-12-05 11:58:34 +08:00
wangliwen 8d62701756 ... 2022-12-05 11:58:23 +08:00
wangliwen 1d33f23fc3 ... 2022-12-05 11:57:35 +08:00
wangliwen df61e3cd99 Merge branch 'master' into docker_package 2022-12-05 10:28:50 +08:00
wangliwen c8f603df6a Merge branch 'dev' 2022-12-05 10:28:42 +08:00
wangliwen 4b724593c6 。。。 2022-12-05 10:26:16 +08:00
wangliwen 5a66d2423e Merge branch 'master' into docker_package 2022-12-05 09:53:13 +08:00
wangliwen b1989791b0 Merge branch 'dev' 2022-12-05 09:53:06 +08:00
wangliwen 77185be5c1 能力申请的催办判断 2022-12-05 09:52:54 +08:00
wangliwen 4bca4247d3 Merge branch 'master' into docker_package 2022-12-05 09:20:54 +08:00
wangliwen 570cfd0d5c Merge branch 'dev' 2022-12-05 09:20:47 +08:00
wangliwen 1a2d443bc0 查看能力申请详情时返回催办相关信息 2022-12-05 09:20:37 +08:00
wangliwen 7ac416f92c Merge branch 'master' into docker_package 2022-12-02 18:16:57 +08:00
wangliwen 4268e557a5 Merge branch 'dev' 2022-12-02 18:16:49 +08:00
dinggang 5c3f32f313 用户角色消失问题 2022-12-02 16:50:29 +08:00
wangliwen b695006954 Merge branch 'master' into docker_package 2022-12-02 15:46:39 +08:00
wangliwen 0b572a1e8b Merge branch 'dev' 2022-12-02 15:46:12 +08:00
wangliwen 4789a3cb60 批量审核通过接口 2022-12-02 15:14:40 +08:00
wangliwen e9f709ce0f Merge branch 'master' into docker_package 2022-12-02 14:19:58 +08:00
wangliwen 7703c6d6cf Merge branch 'dev' 2022-12-02 14:19:48 +08:00
wangliwen f39a9e473e 市局数据资源按照上线部门出数据资源列表 2022-12-02 14:18:54 +08:00
wangliwen 96321f7b84 Merge branch 'master' into docker_package 2022-12-01 18:18:47 +08:00
wangliwen 230664910c Merge branch 'dev' 2022-12-01 18:18:40 +08:00
dinggang f8088fb2f9 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-01 18:17:07 +08:00
dinggang fee19d8f17 1.公告相关接口 
2.建表sql
3.我的待办-能力申请增加资源类型及提供部门字段
4.减少无用日志输出
 2022-12-01 18:16:43 +08:00
wangliwen 1783204473 Merge branch 'master' into docker_package 2022-12-01 17:30:48 +08:00
wangliwen d0fbaee7ba Merge branch 'dev' 2022-12-01 17:30:38 +08:00
wangliwen 0a174de50a 数据资源左侧树 2022-12-01 17:30:28 +08:00
wangliwen 32ac7bf16b Merge branch 'master' into docker_package 2022-12-01 15:48:01 +08:00
wangliwen 9f9ff3fd27 Merge branch 'dev' 2022-12-01 15:47:53 +08:00
wangliwen 3a87c7381d 增加能力申请 是否存在子单驳回的情况 2022-12-01 15:47:08 +08:00
wangliwen 8059071f89 Merge branch 'master' into docker_package 2022-12-01 15:17:38 +08:00
wangliwen 37ca5ade65 Merge branch 'dev' 2022-12-01 15:17:31 +08:00
wangliwen bf684bacbb 能力申请催办相关 2022-12-01 15:17:16 +08:00
wangliwen 9aa06f6253 Merge branch 'master' into docker_package 2022-12-01 14:22:20 +08:00
wangliwen 1bccf11ddb Merge branch 'dev' 2022-12-01 14:22:12 +08:00
wangliwen 49d94eda9d Merge remote-tracking branch '备份/dev' into dev 2022-12-01 14:21:56 +08:00
wangliwen 86c0f106ff 流程内催办条件的判断 2022-12-01 14:21:44 +08:00
dinggang 82faf95eff 1.西海岸审批逻辑修改 
2.资源汇聚总量统计区分西海岸和市局环境
 2022-12-01 09:12:54 +08:00
wangliwen 23d4fd447a Merge branch 'master' into docker_package 2022-11-30 18:55:05 +08:00
wangliwen e437a6819d Merge branch 'dev' 2022-11-30 18:54:58 +08:00
wangliwen 43441e4212 ... 2022-11-30 18:54:51 +08:00
wangliwen b2c780b3e6 Merge branch 'master' into docker_package 2022-11-30 18:45:21 +08:00
wangliwen 92213dccd5 Merge branch 'dev' 2022-11-30 18:45:12 +08:00
wangliwen 57a6014249 sql字段缺失补充 2022-11-30 18:45:05 +08:00
wangliwen 1669dc52ff Merge branch 'master' into docker_package 2022-11-30 18:31:22 +08:00
wangliwen ecf908b5bf Merge branch 'dev' 2022-11-30 18:31:16 +08:00
wangliwen 091e18e6c4 npe的处理 2022-11-30 18:31:09 +08:00
wangliwen 6e71734a50 Merge branch 'master' into docker_package 2022-11-30 18:25:35 +08:00
wangliwen 89b16b4ddf Merge branch 'dev' 2022-11-30 18:25:28 +08:00
wangliwen e96b6f864c 补充全 2022-11-30 18:25:20 +08:00
wangliwen 440400c57f Merge branch 'master' into docker_package 2022-11-30 18:15:20 +08:00
wangliwen 81d7b6dff3 Merge branch 'dev' 2022-11-30 18:15:14 +08:00
wangliwen d32dc84539 ... 2022-11-30 18:15:07 +08:00
wangliwen d2dcacd3a0 Merge branch 'master' into docker_package 2022-11-30 17:57:58 +08:00
wangliwen 96426b2189 Merge branch 'dev' 2022-11-30 17:57:51 +08:00
wangliwen ca9c670032 发起催办业务 2022-11-30 17:57:42 +08:00
wangliwen cbf870c384 Merge branch 'master' into docker_package 2022-11-30 17:31:52 +08:00
wangliwen a9128a99c3 Merge branch 'dev' 2022-11-30 17:31:44 +08:00
wangliwen 58b14ce45e 催办 框架代码与催办消息通知实现 2022-11-30 17:31:03 +08:00
wangliwen fbdb427e54 Merge branch 'master' into docker_package 2022-11-30 12:55:57 +08:00
wangliwen 7bb0c3997d Merge branch 'dev' 2022-11-30 12:55:51 +08:00
wangliwen 2fbc050fa8 sql文件调整 2022-11-30 12:55:38 +08:00
wangliwen b8dfcad52a Merge branch 'master' into docker_package 2022-11-30 12:41:50 +08:00
wangliwen f4714a6dd1 Merge branch 'dev' 2022-11-30 12:41:43 +08:00
wangliwen a809e23874 催办表的创建与配置项的加入 2022-11-30 12:41:35 +08:00
wangliwen da6e87fe44 Merge branch 'master' into docker_package 2022-11-29 18:07:36 +08:00
wangliwen efb2d71a55 Merge branch 'dev' 2022-11-29 18:07:28 +08:00
dinggang 03f37f2083 1.错误修复 
2.用户信息修改增加日志记录
 2022-11-29 18:06:26 +08:00
wangliwen 3f2b29999c Merge branch 'master' into docker_package 2022-11-29 13:17:43 +08:00
wangliwen e4b3caeb0c Merge branch 'dev' 2022-11-29 13:17:35 +08:00
dinggang 476b88a806 统计修改 
sql错误修复
 2022-11-29 13:16:12 +08:00
wangliwen 9a4a9c4ac3 Merge branch 'master' into docker_package 2022-11-29 08:58:39 +08:00
wangliwen 2719a1aa6c Merge branch 'dev' 2022-11-29 08:58:28 +08:00
dinggang 2d152dd94d .. 2022-11-29 08:57:32 +08:00
wangliwen 41a9aec6da Merge branch 'master' into docker_package 2022-11-29 08:57:11 +08:00
wangliwen cfe4c79d5e Merge branch 'dev' 2022-11-29 08:57:04 +08:00
wangliwen f1f52f158a Merge branch 'master' into docker_package 2022-11-29 08:56:23 +08:00
wangliwen baceca0471 Merge branch 'dev' 2022-11-29 08:56:15 +08:00
dinggang 6c82631bf9 . 2022-11-28 19:11:57 +08:00
dinggang 624140d67a 统计错误修复 
用户表增加索引
 2022-11-28 19:10:38 +08:00
dinggang 85e3c58cf8 金额转为万元 2022-11-28 16:47:25 +08:00
dinggang 246494c9cf . 2022-11-28 11:19:44 +08:00
wangliwen 3ef710afc9 Merge branch 'master' into docker_package 2022-11-28 10:58:48 +08:00
wangliwen a789733f6a Merge branch 'dev' 2022-11-28 10:58:41 +08:00
dinggang fc6aa27ad4 西海岸bug 2022-11-28 10:15:27 +08:00
wangliwen 27be87fc5b Merge branch 'master' into docker_package 2022-11-28 09:37:31 +08:00
wangliwen bd3cb9eb40 Merge branch 'dev' 2022-11-28 09:37:22 +08:00
dinggang d2c3f885ed sql修改 2022-11-28 09:36:44 +08:00
wangliwen 7b70e3f969 Merge branch 'master' into docker_package 2022-11-28 09:03:21 +08:00
wangliwen e74212ea27 Merge branch 'dev' 2022-11-28 09:03:12 +08:00
dinggang 76780e2eda 1.重复申请判断逻辑错误，暂时改回原逻辑 
2.资金报表大屏相关接口
 2022-11-26 18:07:39 +08:00
wangliwen 5e08c5600a Merge branch 'master' into docker_package 2022-11-25 17:16:27 +08:00
wangliwen 1fcde01778 Merge branch 'dev' 2022-11-25 17:16:18 +08:00
dinggang e64b5952ca Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-11-25 16:45:31 +08:00
dinggang 8342c4b978 sql修改 2022-11-25 16:45:11 +08:00
wangliwen f6a4a323c4 Merge branch 'master' into docker_package 2022-11-25 16:25:16 +08:00
wangliwen 5b5bf2f3c7 Merge branch 'dev' 2022-11-25 16:25:01 +08:00
huangweixiong efaba0980d Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev 
* 'dev' of http://192.168.124.50/wangliwen/share-platform: (22 commits)
  1.新增查询部门及区市未配置审核人员列表接口 2.角色用户关联表新增修改时间，修改人及删除标志字段 3.修改用户数据变更时角色信息修改逻辑，关联数据由物理删除变为逻辑删除 4.调整其他设计用户角色关联表查询sql，增加删除标志条件
  能力使用导出表头调整
  统计删除知识库数据
  统计小数位数保留错误问题
  1.资金报表增加申请状态
  .
  1.资金报表新增按审核状态查询条件 2.能力统计-能力使用统计明细增加按提供部门查询
  。。。
  统计错误修复
  npe
  申请时增加价格字段
  1.资源重复申请判断逻辑修改 2.新增资金报表需求 3.西海岸已申请列表需求
  1.sql文件命名错误修改
  1.西海岸-已申请列表查询 2.token过期时间改为可配置 3.亚伟通知消息bug修复
  西海岸基础设施新需求-待申请列表增删改查接口 已申请查询，删除接口 超级管理员删除能力数据未删除下架流程相关数据bug修复
  金宏版本不支持，想其他办法
  政务云增加 类型 查询
  ...
  政务云服务资源 本地数据接口
  后台管理能力统计-能力使用统计查询申请部门列表接口修改-只查询有申请记录的部门
  ...
 2022-11-25 16:23:32 +08:00
huangweixiong b5cb7d8441 去掉后台写cookie 2022-11-25 16:22:44 +08:00
dinggang 0d3d6f61ec 1.新增查询部门及区市未配置审核人员列表接口 
2.角色用户关联表新增修改时间，修改人及删除标志字段
3.修改用户数据变更时角色信息修改逻辑，关联数据由物理删除变为逻辑删除
4.调整其他设计用户角色关联表查询sql，增加删除标志条件
 2022-11-25 14:30:52 +08:00
wangliwen 06a3e0c478 Merge branch 'master' into docker_package 2022-11-25 09:48:39 +08:00
wangliwen ca8713ab50 Merge branch 'dev' 2022-11-25 09:48:31 +08:00
wangliwen 02d01ad170 能力使用导出表头调整 2022-11-25 09:48:19 +08:00
wangliwen 08960eebeb Merge branch 'master' into docker_package 2022-11-24 18:00:02 +08:00
wangliwen 0909f09bac Merge branch 'dev' 2022-11-24 17:59:54 +08:00
dinggang 6fa748b834 统计删除知识库数据 2022-11-24 17:59:14 +08:00
wangliwen 54219dafdb Merge branch 'master' into docker_package 2022-11-24 09:05:57 +08:00
wangliwen 477064167c Merge branch 'dev' 2022-11-24 09:05:40 +08:00
dinggang 6dbe768720 统计小数位数保留错误问题 2022-11-23 18:25:14 +08:00
wangliwen 1492eea81e Merge branch 'master' into docker_package 2022-11-23 17:49:07 +08:00
wangliwen 91da0ab040 Merge branch 'dev' 2022-11-23 17:48:58 +08:00
dinggang 4ffae6f944 1.资金报表增加申请状态 2022-11-23 17:47:35 +08:00
wangliwen b278681f47 Merge branch 'master' into docker_package 2022-11-23 17:02:26 +08:00
wangliwen 35ff5a2acc Merge branch 'dev' 2022-11-23 17:02:18 +08:00
dinggang e7b8188f36 . 2022-11-23 16:33:05 +08:00
dinggang 3bdec35655 1.资金报表新增按审核状态查询条件 
2.能力统计-能力使用统计明细增加按提供部门查询
 2022-11-23 16:32:35 +08:00
dinggang c94f0513b4 。。。 2022-11-23 09:41:56 +08:00
wangliwen b7cd32884a Merge branch 'master' into docker_package 2022-11-23 09:18:21 +08:00
wangliwen f4ee5ebd0e Merge branch 'dev' 2022-11-23 09:18:14 +08:00
dinggang e8d2ea9df7 统计错误修复 2022-11-23 09:12:52 +08:00