sunyuchao
|
f50aa552b9
|
Merge branch 'dev_grid_lively_syc' into dev
|
4 years ago |
|
sunyuchao
|
c946e16237
|
查询条件调整，按dateId筛选数据
|
4 years ago |
yinzuomei
|
9f7993fdb1
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
yinzuomei
|
9057033ef0
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev_addcate_and_import
|
4 years ago |
|
yinzuomei
|
5d54b5effd
|
党员风采导入导出添加所属分类名称
|
4 years ago |
zxc
|
93e70100cb
|
louyu
|
4 years ago |
|
sunyuchao
|
a2c287cfac
|
Merge branch 'dev_grid_lively_syc' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
|
sunyuchao
|
7fe3feb239
|
赋能平台 人员调动模块 18类别sql写死问题调整
|
4 years ago |
|
zxc
|
04d5d026c8
|
小区信息导入关联物业
|
4 years ago |
wangxianzhang
|
f5dee363e1
|
调整上传文件的大小限制，测试居民信息导入
|
4 years ago |
|
yinzuomei
|
ddc9bce789
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop
|
4 years ago |
|
zxc
|
4236964b37
|
小区信息导入排除重复名
|
4 years ago |
|
yinzuomei
|
840f3dab79
|
Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev_addcate_and_import
|
4 years ago |
zhaoqifeng
|
ad96489c99
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
1118785559
|
党员风采
|
4 years ago |
jianjun
|
9988dc8f0a
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
827fe5fe70
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
|
4 years ago |
|
jianjun
|
420203339c
|
like错误
|
4 years ago |
|
zhaoqifeng
|
79680cc85d
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
ebf42fef4f
|
获取项目节点耗时信息SQL改造
|
4 years ago |
|
zxc
|
691b65179d
|
小区信息导入
|
4 years ago |
|
jianjun
|
a272bc3ac0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
adae025ffc
|
人员预警漏洞里面 直接限制最多1000 要不然前端显示不了
|
4 years ago |
|
yinzuomei
|
2edc1236ef
|
风采分类
|
4 years ago |
|
jianjun
|
9cd449a6df
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
|
4 years ago |
|
jianjun
|
4b5f6d65ab
|
居民类别分析中 优化查询 pids like 错误
|
4 years ago |
|
sunyuchao
|
190693e320
|
优化程序
|
4 years ago |
|
jianjun
|
767aeb5495
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
|
4 years ago |
|
jianjun
|
fe3f5c682a
|
居民类别分析中 优化查询 空指针判断
|
4 years ago |
|
sunyuchao
|
91406709ad
|
网格活跃度查询统计初版
|
4 years ago |
|
jianjun
|
84b92979ed
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
4 years ago |
|
jianjun
|
e9ff18cd60
|
居民类别分析中 优化查询
|
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
|
10bc2d327a
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
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
|
0ebe87ae0a
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
18b427adcc
|
orgId
|
4 years ago |
|
yinzuomei
|
1e63e16a5a
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
e8b2168069
|
error
|
4 years ago |
|
yinzuomei
|
b51977d3c7
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
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 |
