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 |