jianjun
|
d644704df0
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_match' into master_for_shibei
|
4 years ago |
|
jianjun
|
eba897d4d8
|
程序兼容 市北客户id token置换登陆
|
4 years ago |
|
jianjun
|
dbe45fdfa7
|
Merge remote-tracking branch 'remotes/origin/dev' into shibei_master
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
sunyuchao
|
346b5dcdf7
|
Merge branch 'dev_grid_lively_syc' into dev
|
4 years ago |
|
sunyuchao
|
26936e18b1
|
网格员数据上报接口上传的数据pids是从三个街道开始的，需要在前边拼上平阴县的组织id才可以
|
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 |
|
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 |
|
jianjun
|
a8e540709c
|
Merge remote-tracking branches 'remotes/origin/dev_bugfix_ljj' and 'remotes/origin/dev_optimize_query' into shibei_master
# 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 |
|
zhaoqifeng
|
ad96489c99
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
420203339c
|
like错误
|
4 years ago |
|
zhaoqifeng
|
ebf42fef4f
|
获取项目节点耗时信息SQL改造
|
4 years ago |
|
jianjun
|
adae025ffc
|
人员预警漏洞里面 直接限制最多1000 要不然前端显示不了
|
4 years ago |
|
jianjun
|
4b5f6d65ab
|
居民类别分析中 优化查询 pids like 错误
|
4 years ago |
|
sunyuchao
|
190693e320
|
优化程序
|
4 years ago |
|
jianjun
|
fe3f5c682a
|
居民类别分析中 优化查询 空指针判断
|
4 years ago |
|
sunyuchao
|
91406709ad
|
网格活跃度查询统计初版
|
4 years ago |
|
jianjun
|
e9ff18cd60
|
居民类别分析中 优化查询
|
4 years ago |
|
jianjun
|
2a8db2bff8
|
Merge remote-tracking branch 'remotes/origin/dev' into shibei_master
|
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 |
|
jianjun
|
1d12801b56
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
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 |
|
jianjun
|
e4db1282bd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
jianjun
|
32348c9797
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_for_ic' into shibei_master
|
4 years ago |
|
jianjun
|
ddd2f21a1f
|
Merge remote-tracking branch 'remotes/origin/dev_ic_diaodong' into shibei_master
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
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 |
|
wangxianzhang
|
e516b3e6b9
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
0d5f36f4b7
|
修复：
1.flyway脚本的字段长度问题fix
|
4 years ago |
zxc
|
dda580447d
|
sql长度
|
4 years ago |
