zxc
|
979148f6ad
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
a2f7c1c6e7
|
加筛选条件
|
4 years ago |
|
zxc
|
a3d092549e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
7618b97031
|
起线程
|
4 years ago |
|
zxc
|
e331e31f91
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
9c3d9f35ce
|
位置调整
|
4 years ago |
sunyuchao
|
9621946e42
|
Merge branch 'dev_bug_syc_0217' into dev
|
4 years ago |
|
sunyuchao
|
be77beb872
|
运营数据导出列头日期不对问题修改
|
4 years ago |
wangxianzhang
|
cb3839b821
|
修改：
- 居民导入优化
|
4 years ago |
|
wangxianzhang
|
ec1eee8d70
|
修改：
- 居民导入：增加导入任务记录
|
4 years ago |
|
wangxianzhang
|
e41cf5a506
|
- 优化居民导入
- 优化日志切面打印，增加对MultipartFile类型的过滤
|
4 years ago |
|
wangxianzhang
|
17c7264d82
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_resiimport_optimize
|
4 years ago |
jianjun
|
e0e715ef40
|
按照提示优化代码；尽量使用常量
|
4 years ago |
|
wangxianzhang
|
f7c5e8ceb6
|
修改：
1.居民信息导入：将类别变更数据放到redis中，减少内存占用
|
4 years ago |
|
sunyuchao
|
346b5dcdf7
|
Merge branch 'dev_grid_lively_syc' into dev
|
4 years ago |
|
sunyuchao
|
26936e18b1
|
网格员数据上报接口上传的数据pids是从三个街道开始的，需要在前边拼上平阴县的组织id才可以
|
4 years ago |
|
jianjun
|
3134a60805
|
主线程里创建子线程调用feign接口，通过header消息头带token信息方式
|
4 years ago |
yinzuomei
|
888419fe1e
|
dynamicQuery
|
4 years ago |
zhaoqifeng
|
20b5defc53
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
c082ebafe4
|
获取项目节点耗时信息SQL改造
|
4 years ago |
|
wangxianzhang
|
4922ee5707
|
修改：
1.居民信息导入：将数据分多批次导入，减少内存占用
|
4 years ago |
|
sunyuchao
|
57e040415b
|
Merge branch 'dev_grid_lively_syc' into dev
|
4 years ago |
|
sunyuchao
|
b3432601c3
|
程序优化
|
4 years ago |
|
sunyuchao
|
f50aa552b9
|
Merge branch 'dev_grid_lively_syc' into dev
|
4 years ago |
|
sunyuchao
|
c946e16237
|
查询条件调整，按dateId筛选数据
|
4 years ago |
|
sunyuchao
|
7fe3feb239
|
赋能平台 人员调动模块 18类别sql写死问题调整
|
4 years ago |
|
zhaoqifeng
|
ad96489c99
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
ebf42fef4f
|
获取项目节点耗时信息SQL改造
|
4 years ago |
|
jianjun
|
adae025ffc
|
人员预警漏洞里面 直接限制最多1000 要不然前端显示不了
|
4 years ago |
|
sunyuchao
|
190693e320
|
优化程序
|
4 years ago |
|
sunyuchao
|
91406709ad
|
网格活跃度查询统计初版
|
4 years ago |
|
yinzuomei
|
c3f83a820e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e1ac737788
|
新增楼宇是户数名词改为总户数，左边树无需计算总户数。
|
4 years ago |
|
wangxianzhang
|
fe64517809
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
5ed02f594b
|
修复：
1.导入的时候发生调动动作，附加信息表中有数据时产生多余类别变更记录的bug
|
4 years ago |
|
jianjun
|
4dfa3cfa31
|
调大 agg和report
|
4 years ago |
|
yinzuomei
|
b0a0c1df6c
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
|
4 years ago |
|
yinzuomei
|
18b427adcc
|
orgId
|
4 years ago |
|
yinzuomei
|
e8b2168069
|
error
|
4 years ago |
|
yinzuomei
|
56851c9484
|
orgId
|
4 years ago |
|
yinzuomei
|
ff93e1d090
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
|
4 years ago |
|
yinzuomei
|
282df797cc
|
市北的组织pids是英文逗号隔开，先特殊处理下
|
4 years ago |
|
wangxianzhang
|
c16d31b2d2
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
5f074419ff
|
修复：agency_pids为""的小区，社区查询搜不出来的bug
|
4 years ago |
|
jianjun
|
85039539c8
|
加入市北-居民分类分析数据
|
4 years ago |
|
sunyuchao
|
fe53843355
|
Merge branch 'dev_ic_diaodong' into dev
|
4 years ago |
|
sunyuchao
|
a63a048cea
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
sunyuchao
|
4aee21a14c
|
初始新增变更记录数据时18类都为否的也要有变更记录数据只是没有明细数据
|
4 years ago |
|
yinzuomei
|
8c33f2cbf9
|
Merge remote-tracking branch 'origin/dev_optimize_for_ic' into dev
|
4 years ago |
|
wangxianzhang
|
a608e53d7d
|
Merge branch 'dev_ic_diaodong' into dev
|
4 years ago |
